[PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
edink Thu Nov 13 05:32:06 2003 EDT Modified files: /php-src/ext/gd/libgd gd_jpeg.c /php-src/main config.w32.h /php-src/sapi/cgi/libfcgi/include fcgi_config_win32.h Log: Windows compile fix (patch by [EMAIL PROTECTED]). Index: php-src/ext/gd/libgd/gd_jpeg.c diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.14 php-src/ext/gd/libgd/gd_jpeg.c:1.15 --- php-src/ext/gd/libgd/gd_jpeg.c:1.14 Sat Oct 25 20:42:42 2003 +++ php-src/ext/gd/libgd/gd_jpeg.c Thu Nov 13 05:32:04 2003 @@ -38,10 +38,6 @@ #include jpeglib.h #include jerror.h -#if PHP_WIN32 -typedef SSIZE_T ssize_t; -#endif - static const char *const GD_JPEG_VERSION = 1.0; typedef struct _jmpbuf_wrapper Index: php-src/main/config.w32.h diff -u php-src/main/config.w32.h:1.79 php-src/main/config.w32.h:1.80 --- php-src/main/config.w32.h:1.79 Fri Oct 3 22:51:19 2003 +++ php-src/main/config.w32.h Thu Nov 13 05:32:04 2003 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.79 2003/10/04 02:51:19 moriyoshi Exp $ + $Id: config.w32.h,v 1.80 2003/11/13 10:32:04 edink Exp $ */ /* Default PHP / PEAR directories */ @@ -174,7 +174,7 @@ #define SIZEOF_LONG_LONG_INT 0 #define SIZEOF_LONG_LONG 0 #define SIZEOF_INTMAX_T 0 -#define ssize_t ptrdiff_t +#define ssize_t SSIZE_T #ifdef _WIN64 # define SIZEOF_SIZE_T 8 # define SIZEOF_PTRDIFF_T 8 Index: php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.2 --- php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1Tue Nov 26 00:51:16 2002 +++ php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.hThu Nov 13 05:32:05 2003 @@ -106,6 +106,3 @@ /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ /* #undef inline */ - -/* Define to `int' if sys/types.h does not define. */ -#define ssize_t int \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
Is there a way we can avoid modifying the libfcgi source? This fix will probably be lost when libfcgi is next synced with the official version. --Wez. Index: php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.2 --- php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 Tue Nov 26 00:51:16 2002 +++ php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h Thu Nov 13 05:32:05 2003 @@ -106,6 +106,3 @@ /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ /* #undef inline */ - -/* Define to `int' if sys/types.h does not define. */ -#define ssize_t int \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
On Thu, 13 Nov 2003, Wez Furlong wrote: Is there a way we can avoid modifying the libfcgi source? This fix will probably be lost when libfcgi is next synced with the official version. Three PHP developers (Shane, Frank, me) have direct commit access to the fcgi repository now, so we can and will push changes upwards. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h
We already did :) The original goes: /* Define to `int' if sys/types.h does not define. */ /* #undef ssize_t */ - Steph -Original Message- From: Wez Furlong [mailto:[EMAIL PROTECTED] Sent: 13 November 2003 11:11 To: Edin Kadribasic; [EMAIL PROTECTED] Subject: Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gd_jpeg.c /main config.w32.h /sapi/cgi/libfcgi/include fcgi_config_win32.h Is there a way we can avoid modifying the libfcgi source? This fix will probably be lost when libfcgi is next synced with the official version. --Wez. Index: php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.2 --- php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h:1.1 Tue Nov 26 00:51:16 2002 +++ php-src/sapi/cgi/libfcgi/include/fcgi_config_win32.h Thu Nov 13 05:32:05 2003 @@ -106,6 +106,3 @@ /* Define as `__inline' if that's what the C compiler calls it, or to nothing if it is not supported. */ /* #undef inline */ - -/* Define to `int' if sys/types.h does not define. */ -#define ssize_t int \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
