diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ext/gd/libgd/gd.h | 12 | ||||
| -rw-r--r-- | main/php.h | 7 |
3 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index cb171fc19f..ef5d8ac73f 100644 --- a/configure.ac +++ b/configure.ac @@ -466,7 +466,6 @@ sys/statfs.h \ sys/statvfs.h \ sys/vfs.h \ sys/sysexits.h \ -sys/varargs.h \ sys/wait.h \ sys/loadavg.h \ termios.h \ diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h index c8c6d29c18..89a64041a0 100644 --- a/ext/gd/libgd/gd.h +++ b/ext/gd/libgd/gd.h @@ -47,17 +47,7 @@ extern "C" { #include "gd_io.h" /* va_list needed in gdErrorMethod */ -#ifdef PHP_WIN32 -# include <stdarg.h> -#else -# if HAVE_STDARG_H -# include <stdarg.h> -# else -# if HAVE_SYS_VARARGS_H -# include <sys/varargs.h> -# endif -# endif -#endif +#include <stdarg.h> /* The maximum number of palette entries in palette-based images. In the wonderful new world of gd 2.0, you can of course have diff --git a/main/php.h b/main/php.h index 4134f7b3d4..f23e18eebf 100644 --- a/main/php.h +++ b/main/php.h @@ -224,13 +224,8 @@ typedef unsigned int socklen_t; #if HAVE_UNISTD_H #include <unistd.h> #endif -#if HAVE_STDARG_H + #include <stdarg.h> -#else -# if HAVE_SYS_VARARGS_H -# include <sys/varargs.h> -# endif -#endif #include "php_stdint.h" |