diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/gd/libgd/gd.h | 12 |
2 files changed, 16 insertions, 0 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.2.0alpha2 +- GD: + . Fixed bug #74744 (gd.h: stdarg.h include missing for va_list use in + gdErrorMethod). (rainer dot jung at kippdata dot de, cmb) + - OpenSSL: . Fixed bug #74720 (pkcs7_en/decrypt does not work if \x1a is used in content). (Anatol) diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h index 298599bda6..940650e9f1 100644 --- a/ext/gd/libgd/gd.h +++ b/ext/gd/libgd/gd.h @@ -46,6 +46,18 @@ extern "C" { #include <stdio.h> #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 /* The maximum number of palette entries in palette-based images. In the wonderful new world of gd 2.0, you can of course have |