- Revert ZEND_BEGIN_ARG_INFO change

1 files changed, 98 insertions, 0 deletions

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ad089770c9..1c4149c7bf 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -169,27 +169,33 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type);
 static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold);
 
 /* {{{ arginfo */
+static
 ZEND_BEGIN_ARG_INFO(arginfo_gd_info, 0)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imageloadfont, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetstyle, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, styles) /* ARRAY_INFO(0, styles, 0) */
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatetruecolor, 0)
 	ZEND_ARG_INFO(0, x_size)
 	ZEND_ARG_INFO(0, y_size)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imageistruecolor, 0)
 	ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagetruecolortopalette, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, ditherFlag)
@@ -197,17 +203,20 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagetruecolortopalette, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_GD_BUNDLED
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolormatch, 0)
 	ZEND_ARG_INFO(0, im1)
 	ZEND_ARG_INFO(0, im2)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetthickness, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, thickness)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledellipse, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, cx)
@@ -217,6 +226,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledellipse, 0)
 	ZEND_ARG_INFO(0, color)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledarc, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, cx)
@@ -229,23 +239,27 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledarc, 0)
 	ZEND_ARG_INFO(0, style)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagealphablending, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, blend)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesavealpha, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, save)
 ZEND_END_ARG_INFO()
 
 #if HAVE_GD_BUNDLED
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagelayereffect, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, effect)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocatealpha, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -254,6 +268,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocatealpha, 0)
 	ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolvealpha, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -262,6 +277,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolvealpha, 0)
 	ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosestalpha, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -270,6 +286,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosestalpha, 0)
 	ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexactalpha, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -278,6 +295,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexactalpha, 0)
 	ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresampled, 0)
 	ZEND_ARG_INFO(0, dst_im)
 	ZEND_ARG_INFO(0, src_im)
@@ -292,16 +310,19 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresampled, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef PHP_WIN32
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabwindow, 0, 0, 1)
 	ZEND_ARG_INFO(0, handle)
 	ZEND_ARG_INFO(0, client_area)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagegrabscreen, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_BUNDLED
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, angle)
@@ -311,6 +332,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GD_IMAGESETTILE
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesettile, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, tile)
@@ -318,71 +340,84 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GD_IMAGESETBRUSH
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetbrush, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, brush)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreate, 0)
 	ZEND_ARG_INFO(0, x_size)
 	ZEND_ARG_INFO(0, y_size)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagetypes, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_LIBGD15
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromstring, 0)
 	ZEND_ARG_INFO(0, image)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_GIF_READ
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgif, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_JPG
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromjpeg, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_PNG
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefrompng, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_XBM
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_WBMP
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromwbmp, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GD_GD2
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2part, 0)
 	ZEND_ARG_INFO(0, filename)
 	ZEND_ARG_INFO(0, srcX)
@@ -393,6 +428,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GD_BUNDLED
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagexbm, 0, 0, 2)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -401,6 +437,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_GIF_CREATE
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegif, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -408,6 +445,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_PNG
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepng, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -415,6 +453,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_JPG
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagejpeg, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -423,6 +462,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_WBMP
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagewbmp, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -430,12 +470,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagewbmp, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GD_GD2
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -444,10 +486,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagedestroy, 0)
 	ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocate, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -456,18 +500,21 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocate, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_LIBGD15
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepalettecopy, 0)
 	ZEND_ARG_INFO(0, dst)
 	ZEND_ARG_INFO(0, src)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorat, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x)
 	ZEND_ARG_INFO(0, y)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosest, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -476,6 +523,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosest, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_COLORCLOSESTHWB
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosesthwb, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -484,11 +532,13 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosesthwb, 0)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolordeallocate, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolve, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -496,6 +546,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolve, 0)
 	ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexact, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, red)
@@ -503,6 +554,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexact, 0)
 	ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorset, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, color)
@@ -511,17 +563,20 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorset, 0)
 	ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorsforindex, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagegammacorrect, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, inputgamma)
 	ZEND_ARG_INFO(0, outputgamma)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetpixel, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x)
@@ -529,6 +584,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagesetpixel, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imageline, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x1)
@@ -538,6 +594,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imageline, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagedashedline, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x1)
@@ -547,6 +604,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagedashedline, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagerectangle, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x1)
@@ -556,6 +614,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagerectangle, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledrectangle, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x1)
@@ -565,6 +624,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledrectangle, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagearc, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, cx)
@@ -576,6 +636,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagearc, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imageellipse, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, cx)
@@ -585,6 +646,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imageellipse, 0)
 	ZEND_ARG_INFO(0, color)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilltoborder, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x)
@@ -593,6 +655,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilltoborder, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefill, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, x)
@@ -600,20 +663,24 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefill, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorstotal, 0)
 	ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecolortransparent, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imageinterlace, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, interlace)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */
@@ -621,6 +688,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */
@@ -628,14 +696,17 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefontwidth, 0)
 	ZEND_ARG_INFO(0, font)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefontheight, 0)
 	ZEND_ARG_INFO(0, font)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagechar, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, font)
@@ -645,6 +716,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagechar, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecharup, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, font)
@@ -654,6 +726,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecharup, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagestring, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, font)
@@ -663,6 +736,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagestring, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagestringup, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, font)
@@ -672,6 +746,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagestringup, 0)
 	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopy, 0)
 	ZEND_ARG_INFO(0, dst_im)
 	ZEND_ARG_INFO(0, src_im)
@@ -684,6 +759,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopy, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_LIBGD15
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopymerge, 0)
 	ZEND_ARG_INFO(0, src_im)
 	ZEND_ARG_INFO(0, dst_im)
@@ -696,6 +772,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopymerge, 0)
 	ZEND_ARG_INFO(0, pct)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopymergegray, 0)
 	ZEND_ARG_INFO(0, src_im)
 	ZEND_ARG_INFO(0, dst_im)
@@ -709,6 +786,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopymergegray, 0)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresized, 0)
 	ZEND_ARG_INFO(0, dst_im)
 	ZEND_ARG_INFO(0, src_im)
@@ -722,16 +800,19 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresized, 0)
 	ZEND_ARG_INFO(0, src_h)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesx, 0)
 	ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesy, 0)
 	ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
 #ifdef ENABLE_GD_TTF
 #if HAVE_LIBFREETYPE && HAVE_GD_STRINGFTEX
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4)
 	ZEND_ARG_INFO(0, size)
 	ZEND_ARG_INFO(0, angle)
@@ -740,6 +821,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4)
 	ZEND_ARG_INFO(0, extrainfo) /* ARRAY_INFO(0, extrainfo, 0) */
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefttext, 0, 0, 8)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, size)
@@ -753,6 +835,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefttext, 0, 0, 8)
 ZEND_END_ARG_INFO()
 #endif
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagettfbbox, 0)
 	ZEND_ARG_INFO(0, size)
 	ZEND_ARG_INFO(0, angle)
@@ -760,6 +843,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagettfbbox, 0)
 	ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagettftext, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, size)
@@ -773,35 +857,42 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_LIBT1
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsloadfont, 0)
 	ZEND_ARG_INFO(0, pathname)
 ZEND_END_ARG_INFO()
 
 /*
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepscopyfont, 0)
 	ZEND_ARG_INFO(0, font_index)
 ZEND_END_ARG_INFO()
 */
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsfreefont, 0)
 	ZEND_ARG_INFO(0, font_index)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsencodefont, 0)
 	ZEND_ARG_INFO(0, font_index)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsextendfont, 0)
 	ZEND_ARG_INFO(0, font_index)
 	ZEND_ARG_INFO(0, extend)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsslantfont, 0)
 	ZEND_ARG_INFO(0, font_index)
 	ZEND_ARG_INFO(0, slant)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepstext, 0, 0, 8)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, text)
@@ -817,6 +908,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepstext, 0, 0, 8)
 	ZEND_ARG_INFO(0, antialias)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepsbbox, 0, 0, 3)
 	ZEND_ARG_INFO(0, text)
 	ZEND_ARG_INFO(0, font)
@@ -828,6 +920,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_WBMP
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_image2wbmp, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -836,6 +929,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_JPG) && defined(HAVE_GD_WBMP)
+static
 ZEND_BEGIN_ARG_INFO(arginfo_jpeg2wbmp, 0)
 	ZEND_ARG_INFO(0, f_org)
 	ZEND_ARG_INFO(0, f_dest)
@@ -846,6 +940,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_PNG) && defined(HAVE_GD_WBMP)
+static
 ZEND_BEGIN_ARG_INFO(arginfo_png2wbmp, 0)
 	ZEND_ARG_INFO(0, f_org)
 	ZEND_ARG_INFO(0, f_dest)
@@ -856,6 +951,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_BUNDLED
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefilter, 0, 0, 2)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filtertype)
@@ -864,6 +960,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefilter, 0, 0, 2)
 	ZEND_ARG_INFO(0, arg3)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imageconvolution, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, matrix3x3) /* ARRAY_INFO(0, matrix3x3, 0) */
@@ -873,6 +970,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_BUNDLED
+static
 ZEND_BEGIN_ARG_INFO(arginfo_imageantialias, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, on)