Windows compile fix (patch by sfox@php.net).

diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c
index 3182db12c83db3e3baa34dc29e46fdd8c4ba081d..a2b8b62d905ff237782ba7e701a971042a3fbf89 100644 (file)
--- a/ext/gd/libgd/gd_jpeg.c
+++ b/ext/gd/libgd/gd_jpeg.c
@@ -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

diff --git a/main/config.w32.h b/main/config.w32.h
index 1ef50f12e203b9baed79da7a5f91bb03aff47406..48fb39d943a3461736a95f00b94edaf81157f7c1 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -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

diff --git a/sapi/cgi/libfcgi/include/fcgi_config_win32.h b/sapi/cgi/libfcgi/include/fcgi_config_win32.h
index 81ff264d9f5e00a20089a8922bb922a1c5e3f94e..a9ec224deb60c9de55def3f5f5f98691e01d1850 100644 (file)
--- a/sapi/cgi/libfcgi/include/fcgi_config_win32.h
+++ b/sapi/cgi/libfcgi/include/fcgi_config_win32.h
@@ -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