- Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro (again!)

1 files changed, 0 insertions, 98 deletions

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index c11620cb1f..95ba2c76aa 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -135,33 +135,27 @@ 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_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)
@@ -169,20 +163,17 @@ 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)
@@ -192,7 +183,6 @@ 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)
@@ -205,27 +195,23 @@ 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)
@@ -234,7 +220,6 @@ 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)
@@ -243,7 +228,6 @@ 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)
@@ -252,7 +236,6 @@ 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)
@@ -261,7 +244,6 @@ 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)
@@ -276,19 +258,16 @@ 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)
@@ -298,7 +277,6 @@ 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)
@@ -306,79 +284,66 @@ 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()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromstring, 0)
 	ZEND_ARG_INFO(0, image)
 ZEND_END_ARG_INFO()
 
 #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
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromwbmp, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd, 0)
 	ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-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)
@@ -388,7 +353,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2part, 0)
 ZEND_END_ARG_INFO()
 
 #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)
@@ -397,7 +361,6 @@ 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)
@@ -405,7 +368,6 @@ 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)
@@ -413,7 +375,6 @@ 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)
@@ -421,20 +382,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagejpeg, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagewbmp, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
 	ZEND_ARG_INFO(0, foreground)
 ZEND_END_ARG_INFO()
 
-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()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -442,12 +400,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1)
 	ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-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)
@@ -455,20 +411,17 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocate, 0)
 	ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepalettecopy, 0)
 	ZEND_ARG_INFO(0, dst)
 	ZEND_ARG_INFO(0, src)
 ZEND_END_ARG_INFO()
 
-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)
@@ -477,7 +430,6 @@ 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)
@@ -486,13 +438,11 @@ 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)
@@ -500,7 +450,6 @@ 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)
@@ -508,7 +457,6 @@ 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)
@@ -517,20 +465,17 @@ 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)
@@ -538,7 +483,6 @@ 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)
@@ -548,7 +492,6 @@ 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)
@@ -558,7 +501,6 @@ 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)
@@ -568,7 +510,6 @@ 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)
@@ -578,7 +519,6 @@ 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)
@@ -590,7 +530,6 @@ 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)
@@ -600,7 +539,6 @@ 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)
@@ -609,7 +547,6 @@ 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)
@@ -617,24 +554,20 @@ 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_ARRAY_INFO(0, points, 0)
@@ -642,7 +575,6 @@ 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_ARRAY_INFO(0, points, 0)
@@ -650,17 +582,14 @@ 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)
@@ -670,7 +599,6 @@ 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)
@@ -680,7 +608,6 @@ 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)
@@ -690,7 +617,6 @@ 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)
@@ -700,7 +626,6 @@ 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)
@@ -712,7 +637,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopy, 0)
 	ZEND_ARG_INFO(0, src_h)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopymerge, 0)
 	ZEND_ARG_INFO(0, src_im)
 	ZEND_ARG_INFO(0, dst_im)
@@ -725,7 +649,6 @@ 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)
@@ -738,7 +661,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopymergegray, 0)
 	ZEND_ARG_INFO(0, pct)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresized, 0)
 	ZEND_ARG_INFO(0, dst_im)
 	ZEND_ARG_INFO(0, src_im)
@@ -752,19 +674,16 @@ 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)
@@ -773,7 +692,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4)
 	ZEND_ARG_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)
@@ -787,7 +705,6 @@ 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)
@@ -795,7 +712,6 @@ 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)
@@ -809,42 +725,35 @@ 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)
@@ -860,7 +769,6 @@ 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)
@@ -871,7 +779,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepsbbox, 0, 0, 3)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_image2wbmp, 0, 0, 1)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, filename)
@@ -879,7 +786,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_image2wbmp, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_JPG)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jpeg2wbmp, 0)
 	ZEND_ARG_INFO(0, f_org)
 	ZEND_ARG_INFO(0, f_dest)
@@ -890,7 +796,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_PNG)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_png2wbmp, 0)
 	ZEND_ARG_INFO(0, f_org)
 	ZEND_ARG_INFO(0, f_dest)
@@ -901,7 +806,6 @@ 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)
@@ -910,7 +814,6 @@ 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_ARRAY_INFO(0, matrix3x3, 0)
@@ -920,7 +823,6 @@ 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)