]> granicus.if.org Git - php/commitdiff
Remove HAVE_SYS_VARARGS_H
authorPeter Kokot <peterkokot@gmail.com>
Sun, 16 Sep 2018 01:31:24 +0000 (03:31 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Sun, 16 Sep 2018 18:50:20 +0000 (20:50 +0200)
Outdated systems used to provide the `<varargs.h>` and in case of PHP
`<sys/varargs.h>`. [1]

Current systems have `<stdarg.h>` which is also a C89 standard header
and systems have it always present. [2]

[1] https://en.wikipedia.org/wiki/Stdarg.h#varargs.h
[2] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2

configure.ac
ext/gd/libgd/gd.h
main/php.h

index cb171fc19f99d15a7268b39743a2625ce3f95389..ef5d8ac73fa6b4e8858b17839996631acdb88fcf 100644 (file)
@@ -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 \
index c8c6d29c180c3927ac11187f398213331be5c2d2..89a64041a0eaac91e1805fdd51eef68ca2de8a4d 100644 (file)
@@ -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
index 4134f7b3d427830cb1b385adf89101b367f6fecb..f23e18eebf02ff92df10cd84c257bd8678b2763a 100644 (file)
@@ -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"