Generate functions entries from stubs for another set of extensions

Closes GH-5351

4 files changed, 286 insertions, 284 deletions

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 8435d765b6..5bb840aad8 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -238,160 +238,10 @@ static void php_gd_object_minit_helper()
  *
  ********************************************************/
 
-/* {{{ gd_functions[]
- */
-static const zend_function_entry gd_functions[] = {
-	PHP_FE(gd_info,                                 arginfo_gd_info)
-	PHP_FE(imagearc,								arginfo_imagearc)
-	PHP_FE(imageellipse,							arginfo_imageellipse)
-	PHP_FE(imagechar,								arginfo_imagechar)
-	PHP_FE(imagecharup,								arginfo_imagecharup)
-	PHP_FE(imagecolorat,							arginfo_imagecolorat)
-	PHP_FE(imagecolorallocate,						arginfo_imagecolorallocate)
-	PHP_FE(imagepalettecopy,						arginfo_imagepalettecopy)
-	PHP_FE(imagecreatefromstring,					arginfo_imagecreatefromstring)
-	PHP_FE(imagecolorclosest,						arginfo_imagecolorclosest)
-	PHP_FE(imagecolorclosesthwb,					arginfo_imagecolorclosesthwb)
-	PHP_FE(imagecolordeallocate,					arginfo_imagecolordeallocate)
-	PHP_FE(imagecolorresolve,						arginfo_imagecolorresolve)
-	PHP_FE(imagecolorexact,							arginfo_imagecolorexact)
-	PHP_FE(imagecolorset,							arginfo_imagecolorset)
-	PHP_FE(imagecolortransparent,					arginfo_imagecolortransparent)
-	PHP_FE(imagecolorstotal,						arginfo_imagecolorstotal)
-	PHP_FE(imagecolorsforindex,						arginfo_imagecolorsforindex)
-	PHP_FE(imagecopy,								arginfo_imagecopy)
-	PHP_FE(imagecopymerge,							arginfo_imagecopymerge)
-	PHP_FE(imagecopymergegray,						arginfo_imagecopymergegray)
-	PHP_FE(imagecopyresized,						arginfo_imagecopyresized)
-	PHP_FE(imagecreate,								arginfo_imagecreate)
-	PHP_FE(imagecreatetruecolor,					arginfo_imagecreatetruecolor)
-	PHP_FE(imageistruecolor,						arginfo_imageistruecolor)
-	PHP_FE(imagetruecolortopalette,					arginfo_imagetruecolortopalette)
-	PHP_FE(imagepalettetotruecolor,					arginfo_imagepalettetotruecolor)
-	PHP_FE(imagesetthickness,						arginfo_imagesetthickness)
-	PHP_FE(imagefilledarc,							arginfo_imagefilledarc)
-	PHP_FE(imagefilledellipse,						arginfo_imagefilledellipse)
-	PHP_FE(imagealphablending,						arginfo_imagealphablending)
-	PHP_FE(imagesavealpha,							arginfo_imagesavealpha)
-	PHP_FE(imagecolorallocatealpha,					arginfo_imagecolorallocatealpha)
-	PHP_FE(imagecolorresolvealpha, 					arginfo_imagecolorresolvealpha)
-	PHP_FE(imagecolorclosestalpha,					arginfo_imagecolorclosestalpha)
-	PHP_FE(imagecolorexactalpha,					arginfo_imagecolorexactalpha)
-	PHP_FE(imagecopyresampled,						arginfo_imagecopyresampled)
-
-#ifdef PHP_WIN32
-	PHP_FE(imagegrabwindow,							arginfo_imagegrabwindow)
-	PHP_FE(imagegrabscreen,							arginfo_imagegrabscreen)
-#endif
-
-	PHP_FE(imagerotate,								arginfo_imagerotate)
-	PHP_FE(imageflip,								arginfo_imageflip)
-
-	PHP_FE(imageantialias,							arginfo_imageantialias)
-	PHP_FE(imagecrop,								arginfo_imagecrop)
-	PHP_FE(imagecropauto,							arginfo_imagecropauto)
-	PHP_FE(imagescale,								arginfo_imagescale)
-	PHP_FE(imageaffine,								arginfo_imageaffine)
-	PHP_FE(imageaffinematrixconcat,					arginfo_imageaffinematrixconcat)
-	PHP_FE(imageaffinematrixget,					arginfo_imageaffinematrixget)
-	PHP_FE(imagegetinterpolation,					arginfo_imagegetinterpolation)
-	PHP_FE(imagesetinterpolation,					arginfo_imagesetinterpolation)
-	PHP_FE(imagesettile,							arginfo_imagesettile)
-	PHP_FE(imagesetbrush,							arginfo_imagesetbrush)
-	PHP_FE(imagesetstyle,							arginfo_imagesetstyle)
-
-#ifdef HAVE_GD_PNG
-	PHP_FE(imagecreatefrompng,						arginfo_imagecreatefrompng)
-#endif
-#ifdef HAVE_GD_WEBP
-	PHP_FE(imagecreatefromwebp,						arginfo_imagecreatefromwebp)
-#endif
-	PHP_FE(imagecreatefromgif,						arginfo_imagecreatefromgif)
-#ifdef HAVE_GD_JPG
-	PHP_FE(imagecreatefromjpeg,						arginfo_imagecreatefromjpeg)
-#endif
-	PHP_FE(imagecreatefromwbmp,						arginfo_imagecreatefromwbmp)
-	PHP_FE(imagecreatefromxbm,						arginfo_imagecreatefromxbm)
-#if defined(HAVE_GD_XPM)
-	PHP_FE(imagecreatefromxpm,						arginfo_imagecreatefromxpm)
-#endif
-	PHP_FE(imagecreatefromgd,						arginfo_imagecreatefromgd)
-	PHP_FE(imagecreatefromgd2,						arginfo_imagecreatefromgd2)
-	PHP_FE(imagecreatefromgd2part,					arginfo_imagecreatefromgd2part)
-#ifdef HAVE_GD_BMP
-	PHP_FE(imagecreatefrombmp,						arginfo_imagecreatefrombmp)
-#endif
-#ifdef HAVE_GD_TGA
-	PHP_FE(imagecreatefromtga,						arginfo_imagecreatefromtga)
-#endif
-#ifdef HAVE_GD_PNG
-	PHP_FE(imagepng,								arginfo_imagepng)
-#endif
-#ifdef HAVE_GD_WEBP
-	PHP_FE(imagewebp,								arginfo_imagewebp)
-#endif
-	PHP_FE(imagegif,								arginfo_imagegif)
-#ifdef HAVE_GD_JPG
-	PHP_FE(imagejpeg,								arginfo_imagejpeg)
-#endif
-	PHP_FE(imagewbmp,								arginfo_imagewbmp)
-	PHP_FE(imagegd,									arginfo_imagegd)
-	PHP_FE(imagegd2,								arginfo_imagegd2)
-#ifdef HAVE_GD_BMP
-	PHP_FE(imagebmp,								arginfo_imagebmp)
-#endif
-
-	PHP_FE(imagedestroy,							arginfo_imagedestroy)
-	PHP_FE(imagegammacorrect,						arginfo_imagegammacorrect)
-	PHP_FE(imagefill,								arginfo_imagefill)
-	PHP_FE(imagefilledpolygon,						arginfo_imagefilledpolygon)
-	PHP_FE(imagefilledrectangle,					arginfo_imagefilledrectangle)
-	PHP_FE(imagefilltoborder,						arginfo_imagefilltoborder)
-	PHP_FE(imagefontwidth,							arginfo_imagefontwidth)
-	PHP_FE(imagefontheight,							arginfo_imagefontheight)
-	PHP_FE(imageinterlace,							arginfo_imageinterlace)
-	PHP_FE(imageline,								arginfo_imageline)
-	PHP_FE(imageloadfont,							arginfo_imageloadfont)
-	PHP_FE(imagepolygon,							arginfo_imagepolygon)
-	PHP_FE(imageopenpolygon,						arginfo_imageopenpolygon)
-	PHP_FE(imagerectangle,							arginfo_imagerectangle)
-	PHP_FE(imagesetpixel,							arginfo_imagesetpixel)
-	PHP_FE(imagestring,								arginfo_imagestring)
-	PHP_FE(imagestringup,							arginfo_imagestringup)
-	PHP_FE(imagesx,									arginfo_imagesx)
-	PHP_FE(imagesy,									arginfo_imagesy)
-	PHP_FE(imagesetclip,							arginfo_imagesetclip)
-	PHP_FE(imagegetclip,							arginfo_imagegetclip)
-	PHP_FE(imagedashedline,							arginfo_imagedashedline)
-
-#ifdef HAVE_GD_FREETYPE
-	PHP_FE(imagettfbbox,							arginfo_imagettfbbox)
-	PHP_FE(imagettftext,							arginfo_imagettftext)
-	PHP_FE(imageftbbox,								arginfo_imageftbbox)
-	PHP_FE(imagefttext,								arginfo_imagefttext)
-#endif
-
-	PHP_FE(imagetypes,								arginfo_imagetypes)
-
-	PHP_FE(imagelayereffect,						arginfo_imagelayereffect)
-	PHP_FE(imagexbm,								arginfo_imagexbm)
-
-	PHP_FE(imagecolormatch,							arginfo_imagecolormatch)
-
-/* gd filters */
-	PHP_FE(imagefilter,		 						arginfo_imagefilter)
-	PHP_FE(imageconvolution,						arginfo_imageconvolution)
-
-	PHP_FE(imageresolution,							arginfo_imageresolution)
-
-	PHP_FE_END
-};
-/* }}} */
-
 zend_module_entry gd_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"gd",
-	gd_functions,
+	ext_functions,
 	PHP_MINIT(gd),
 	PHP_MSHUTDOWN(gd),
 	NULL,
diff --git a/ext/gd/gd.stub.php b/ext/gd/gd.stub.php
index 18497cddfe..1a886f5965 100644
--- a/ext/gd/gd.stub.php
+++ b/ext/gd/gd.stub.php
@@ -1,5 +1,7 @@
 <?php
 
+/** @generate-function-entries */
+
 function gd_info(): array {}
 
 function imageloadfont(string $filename): int|false {}
diff --git a/ext/gd/gd_arginfo.h b/ext/gd/gd_arginfo.h
index e829e3a4bc..cc2944913e 100644
--- a/ext/gd/gd_arginfo.h
+++ b/ext/gd/gd_arginfo.h
@@ -568,3 +568,286 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imageresolution, 0, 1, MAY_BE_AR
 	ZEND_ARG_TYPE_INFO(0, res_x, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, res_y, IS_LONG, 0)
 ZEND_END_ARG_INFO()
+
+
+ZEND_FUNCTION(gd_info);
+ZEND_FUNCTION(imageloadfont);
+ZEND_FUNCTION(imagesetstyle);
+ZEND_FUNCTION(imagecreatetruecolor);
+ZEND_FUNCTION(imageistruecolor);
+ZEND_FUNCTION(imagetruecolortopalette);
+ZEND_FUNCTION(imagepalettetotruecolor);
+ZEND_FUNCTION(imagecolormatch);
+ZEND_FUNCTION(imagesetthickness);
+ZEND_FUNCTION(imagefilledellipse);
+ZEND_FUNCTION(imagefilledarc);
+ZEND_FUNCTION(imagealphablending);
+ZEND_FUNCTION(imagesavealpha);
+ZEND_FUNCTION(imagelayereffect);
+ZEND_FUNCTION(imagecolorallocatealpha);
+ZEND_FUNCTION(imagecolorresolvealpha);
+ZEND_FUNCTION(imagecolorclosestalpha);
+ZEND_FUNCTION(imagecolorexactalpha);
+ZEND_FUNCTION(imagecopyresampled);
+#if defined(PHP_WIN32)
+ZEND_FUNCTION(imagegrabwindow);
+#endif
+#if defined(PHP_WIN32)
+ZEND_FUNCTION(imagegrabscreen);
+#endif
+ZEND_FUNCTION(imagerotate);
+ZEND_FUNCTION(imagesettile);
+ZEND_FUNCTION(imagesetbrush);
+ZEND_FUNCTION(imagecreate);
+ZEND_FUNCTION(imagetypes);
+ZEND_FUNCTION(imagecreatefromstring);
+ZEND_FUNCTION(imagecreatefromgif);
+#if defined(HAVE_GD_JPG)
+ZEND_FUNCTION(imagecreatefromjpeg);
+#endif
+#if defined(HAVE_GD_PNG)
+ZEND_FUNCTION(imagecreatefrompng);
+#endif
+#if defined(HAVE_GD_WEBP)
+ZEND_FUNCTION(imagecreatefromwebp);
+#endif
+ZEND_FUNCTION(imagecreatefromxbm);
+#if defined(HAVE_GD_XPM)
+ZEND_FUNCTION(imagecreatefromxpm);
+#endif
+ZEND_FUNCTION(imagecreatefromwbmp);
+ZEND_FUNCTION(imagecreatefromgd);
+ZEND_FUNCTION(imagecreatefromgd2);
+ZEND_FUNCTION(imagecreatefromgd2part);
+#if defined(HAVE_GD_BMP)
+ZEND_FUNCTION(imagecreatefrombmp);
+#endif
+#if defined(HAVE_GD_TGA)
+ZEND_FUNCTION(imagecreatefromtga);
+#endif
+ZEND_FUNCTION(imagexbm);
+ZEND_FUNCTION(imagegif);
+#if defined(HAVE_GD_PNG)
+ZEND_FUNCTION(imagepng);
+#endif
+#if defined(HAVE_GD_WEBP)
+ZEND_FUNCTION(imagewebp);
+#endif
+#if defined(HAVE_GD_JPG)
+ZEND_FUNCTION(imagejpeg);
+#endif
+ZEND_FUNCTION(imagewbmp);
+ZEND_FUNCTION(imagegd);
+ZEND_FUNCTION(imagegd2);
+#if defined(HAVE_GD_BMP)
+ZEND_FUNCTION(imagebmp);
+#endif
+ZEND_FUNCTION(imagedestroy);
+ZEND_FUNCTION(imagecolorallocate);
+ZEND_FUNCTION(imagepalettecopy);
+ZEND_FUNCTION(imagecolorat);
+ZEND_FUNCTION(imagecolorclosest);
+ZEND_FUNCTION(imagecolorclosesthwb);
+ZEND_FUNCTION(imagecolordeallocate);
+ZEND_FUNCTION(imagecolorresolve);
+ZEND_FUNCTION(imagecolorexact);
+ZEND_FUNCTION(imagecolorset);
+ZEND_FUNCTION(imagecolorsforindex);
+ZEND_FUNCTION(imagegammacorrect);
+ZEND_FUNCTION(imagesetpixel);
+ZEND_FUNCTION(imageline);
+ZEND_FUNCTION(imagedashedline);
+ZEND_FUNCTION(imagerectangle);
+ZEND_FUNCTION(imagefilledrectangle);
+ZEND_FUNCTION(imagearc);
+ZEND_FUNCTION(imageellipse);
+ZEND_FUNCTION(imagefilltoborder);
+ZEND_FUNCTION(imagefill);
+ZEND_FUNCTION(imagecolorstotal);
+ZEND_FUNCTION(imagecolortransparent);
+ZEND_FUNCTION(imageinterlace);
+ZEND_FUNCTION(imagepolygon);
+ZEND_FUNCTION(imageopenpolygon);
+ZEND_FUNCTION(imagefilledpolygon);
+ZEND_FUNCTION(imagefontwidth);
+ZEND_FUNCTION(imagefontheight);
+ZEND_FUNCTION(imagechar);
+ZEND_FUNCTION(imagecharup);
+ZEND_FUNCTION(imagestring);
+ZEND_FUNCTION(imagestringup);
+ZEND_FUNCTION(imagecopy);
+ZEND_FUNCTION(imagecopymerge);
+ZEND_FUNCTION(imagecopymergegray);
+ZEND_FUNCTION(imagecopyresized);
+ZEND_FUNCTION(imagesx);
+ZEND_FUNCTION(imagesy);
+ZEND_FUNCTION(imagesetclip);
+ZEND_FUNCTION(imagegetclip);
+#if defined(HAVE_GD_FREETYPE)
+ZEND_FUNCTION(imageftbbox);
+#endif
+#if defined(HAVE_GD_FREETYPE)
+ZEND_FUNCTION(imagefttext);
+#endif
+#if defined(HAVE_GD_FREETYPE)
+ZEND_FUNCTION(imagettfbbox);
+#endif
+#if defined(HAVE_GD_FREETYPE)
+ZEND_FUNCTION(imagettftext);
+#endif
+ZEND_FUNCTION(imagefilter);
+ZEND_FUNCTION(imageconvolution);
+ZEND_FUNCTION(imageflip);
+ZEND_FUNCTION(imageantialias);
+ZEND_FUNCTION(imagecrop);
+ZEND_FUNCTION(imagecropauto);
+ZEND_FUNCTION(imagescale);
+ZEND_FUNCTION(imageaffine);
+ZEND_FUNCTION(imageaffinematrixget);
+ZEND_FUNCTION(imageaffinematrixconcat);
+ZEND_FUNCTION(imagegetinterpolation);
+ZEND_FUNCTION(imagesetinterpolation);
+ZEND_FUNCTION(imageresolution);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(gd_info, arginfo_gd_info)
+	ZEND_FE(imageloadfont, arginfo_imageloadfont)
+	ZEND_FE(imagesetstyle, arginfo_imagesetstyle)
+	ZEND_FE(imagecreatetruecolor, arginfo_imagecreatetruecolor)
+	ZEND_FE(imageistruecolor, arginfo_imageistruecolor)
+	ZEND_FE(imagetruecolortopalette, arginfo_imagetruecolortopalette)
+	ZEND_FE(imagepalettetotruecolor, arginfo_imagepalettetotruecolor)
+	ZEND_FE(imagecolormatch, arginfo_imagecolormatch)
+	ZEND_FE(imagesetthickness, arginfo_imagesetthickness)
+	ZEND_FE(imagefilledellipse, arginfo_imagefilledellipse)
+	ZEND_FE(imagefilledarc, arginfo_imagefilledarc)
+	ZEND_FE(imagealphablending, arginfo_imagealphablending)
+	ZEND_FE(imagesavealpha, arginfo_imagesavealpha)
+	ZEND_FE(imagelayereffect, arginfo_imagelayereffect)
+	ZEND_FE(imagecolorallocatealpha, arginfo_imagecolorallocatealpha)
+	ZEND_FE(imagecolorresolvealpha, arginfo_imagecolorresolvealpha)
+	ZEND_FE(imagecolorclosestalpha, arginfo_imagecolorclosestalpha)
+	ZEND_FE(imagecolorexactalpha, arginfo_imagecolorexactalpha)
+	ZEND_FE(imagecopyresampled, arginfo_imagecopyresampled)
+#if defined(PHP_WIN32)
+	ZEND_FE(imagegrabwindow, arginfo_imagegrabwindow)
+#endif
+#if defined(PHP_WIN32)
+	ZEND_FE(imagegrabscreen, arginfo_imagegrabscreen)
+#endif
+	ZEND_FE(imagerotate, arginfo_imagerotate)
+	ZEND_FE(imagesettile, arginfo_imagesettile)
+	ZEND_FE(imagesetbrush, arginfo_imagesetbrush)
+	ZEND_FE(imagecreate, arginfo_imagecreate)
+	ZEND_FE(imagetypes, arginfo_imagetypes)
+	ZEND_FE(imagecreatefromstring, arginfo_imagecreatefromstring)
+	ZEND_FE(imagecreatefromgif, arginfo_imagecreatefromgif)
+#if defined(HAVE_GD_JPG)
+	ZEND_FE(imagecreatefromjpeg, arginfo_imagecreatefromjpeg)
+#endif
+#if defined(HAVE_GD_PNG)
+	ZEND_FE(imagecreatefrompng, arginfo_imagecreatefrompng)
+#endif
+#if defined(HAVE_GD_WEBP)
+	ZEND_FE(imagecreatefromwebp, arginfo_imagecreatefromwebp)
+#endif
+	ZEND_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm)
+#if defined(HAVE_GD_XPM)
+	ZEND_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm)
+#endif
+	ZEND_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp)
+	ZEND_FE(imagecreatefromgd, arginfo_imagecreatefromgd)
+	ZEND_FE(imagecreatefromgd2, arginfo_imagecreatefromgd2)
+	ZEND_FE(imagecreatefromgd2part, arginfo_imagecreatefromgd2part)
+#if defined(HAVE_GD_BMP)
+	ZEND_FE(imagecreatefrombmp, arginfo_imagecreatefrombmp)
+#endif
+#if defined(HAVE_GD_TGA)
+	ZEND_FE(imagecreatefromtga, arginfo_imagecreatefromtga)
+#endif
+	ZEND_FE(imagexbm, arginfo_imagexbm)
+	ZEND_FE(imagegif, arginfo_imagegif)
+#if defined(HAVE_GD_PNG)
+	ZEND_FE(imagepng, arginfo_imagepng)
+#endif
+#if defined(HAVE_GD_WEBP)
+	ZEND_FE(imagewebp, arginfo_imagewebp)
+#endif
+#if defined(HAVE_GD_JPG)
+	ZEND_FE(imagejpeg, arginfo_imagejpeg)
+#endif
+	ZEND_FE(imagewbmp, arginfo_imagewbmp)
+	ZEND_FE(imagegd, arginfo_imagegd)
+	ZEND_FE(imagegd2, arginfo_imagegd2)
+#if defined(HAVE_GD_BMP)
+	ZEND_FE(imagebmp, arginfo_imagebmp)
+#endif
+	ZEND_FE(imagedestroy, arginfo_imagedestroy)
+	ZEND_FE(imagecolorallocate, arginfo_imagecolorallocate)
+	ZEND_FE(imagepalettecopy, arginfo_imagepalettecopy)
+	ZEND_FE(imagecolorat, arginfo_imagecolorat)
+	ZEND_FE(imagecolorclosest, arginfo_imagecolorclosest)
+	ZEND_FE(imagecolorclosesthwb, arginfo_imagecolorclosesthwb)
+	ZEND_FE(imagecolordeallocate, arginfo_imagecolordeallocate)
+	ZEND_FE(imagecolorresolve, arginfo_imagecolorresolve)
+	ZEND_FE(imagecolorexact, arginfo_imagecolorexact)
+	ZEND_FE(imagecolorset, arginfo_imagecolorset)
+	ZEND_FE(imagecolorsforindex, arginfo_imagecolorsforindex)
+	ZEND_FE(imagegammacorrect, arginfo_imagegammacorrect)
+	ZEND_FE(imagesetpixel, arginfo_imagesetpixel)
+	ZEND_FE(imageline, arginfo_imageline)
+	ZEND_FE(imagedashedline, arginfo_imagedashedline)
+	ZEND_FE(imagerectangle, arginfo_imagerectangle)
+	ZEND_FE(imagefilledrectangle, arginfo_imagefilledrectangle)
+	ZEND_FE(imagearc, arginfo_imagearc)
+	ZEND_FE(imageellipse, arginfo_imageellipse)
+	ZEND_FE(imagefilltoborder, arginfo_imagefilltoborder)
+	ZEND_FE(imagefill, arginfo_imagefill)
+	ZEND_FE(imagecolorstotal, arginfo_imagecolorstotal)
+	ZEND_FE(imagecolortransparent, arginfo_imagecolortransparent)
+	ZEND_FE(imageinterlace, arginfo_imageinterlace)
+	ZEND_FE(imagepolygon, arginfo_imagepolygon)
+	ZEND_FE(imageopenpolygon, arginfo_imageopenpolygon)
+	ZEND_FE(imagefilledpolygon, arginfo_imagefilledpolygon)
+	ZEND_FE(imagefontwidth, arginfo_imagefontwidth)
+	ZEND_FE(imagefontheight, arginfo_imagefontheight)
+	ZEND_FE(imagechar, arginfo_imagechar)
+	ZEND_FE(imagecharup, arginfo_imagecharup)
+	ZEND_FE(imagestring, arginfo_imagestring)
+	ZEND_FE(imagestringup, arginfo_imagestringup)
+	ZEND_FE(imagecopy, arginfo_imagecopy)
+	ZEND_FE(imagecopymerge, arginfo_imagecopymerge)
+	ZEND_FE(imagecopymergegray, arginfo_imagecopymergegray)
+	ZEND_FE(imagecopyresized, arginfo_imagecopyresized)
+	ZEND_FE(imagesx, arginfo_imagesx)
+	ZEND_FE(imagesy, arginfo_imagesy)
+	ZEND_FE(imagesetclip, arginfo_imagesetclip)
+	ZEND_FE(imagegetclip, arginfo_imagegetclip)
+#if defined(HAVE_GD_FREETYPE)
+	ZEND_FE(imageftbbox, arginfo_imageftbbox)
+#endif
+#if defined(HAVE_GD_FREETYPE)
+	ZEND_FE(imagefttext, arginfo_imagefttext)
+#endif
+#if defined(HAVE_GD_FREETYPE)
+	ZEND_FE(imagettfbbox, arginfo_imagettfbbox)
+#endif
+#if defined(HAVE_GD_FREETYPE)
+	ZEND_FE(imagettftext, arginfo_imagettftext)
+#endif
+	ZEND_FE(imagefilter, arginfo_imagefilter)
+	ZEND_FE(imageconvolution, arginfo_imageconvolution)
+	ZEND_FE(imageflip, arginfo_imageflip)
+	ZEND_FE(imageantialias, arginfo_imageantialias)
+	ZEND_FE(imagecrop, arginfo_imagecrop)
+	ZEND_FE(imagecropauto, arginfo_imagecropauto)
+	ZEND_FE(imagescale, arginfo_imagescale)
+	ZEND_FE(imageaffine, arginfo_imageaffine)
+	ZEND_FE(imageaffinematrixget, arginfo_imageaffinematrixget)
+	ZEND_FE(imageaffinematrixconcat, arginfo_imageaffinematrixconcat)
+	ZEND_FE(imagegetinterpolation, arginfo_imagegetinterpolation)
+	ZEND_FE(imagesetinterpolation, arginfo_imagesetinterpolation)
+	ZEND_FE(imageresolution, arginfo_imageresolution)
+	ZEND_FE_END
+};
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index d429530479..32fba66165 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -77,139 +77,6 @@ PHP_MINIT_FUNCTION(gd);
 PHP_MSHUTDOWN_FUNCTION(gd);
 PHP_RSHUTDOWN_FUNCTION(gd);
 
-PHP_FUNCTION(gd_info);
-PHP_FUNCTION(imagearc);
-PHP_FUNCTION(imageellipse);
-PHP_FUNCTION(imagechar);
-PHP_FUNCTION(imagecharup);
-PHP_FUNCTION(imageistruecolor);
-PHP_FUNCTION(imagecolorallocate);
-PHP_FUNCTION(imagepalettecopy);
-PHP_FUNCTION(imagecolorat);
-PHP_FUNCTION(imagecolorclosest);
-PHP_FUNCTION(imagecolorclosesthwb);
-PHP_FUNCTION(imagecolordeallocate);
-PHP_FUNCTION(imagecolorresolve);
-PHP_FUNCTION(imagecolorexact);
-PHP_FUNCTION(imagecolorset);
-PHP_FUNCTION(imagecolorstotal);
-PHP_FUNCTION(imagecolorsforindex);
-PHP_FUNCTION(imagecolortransparent);
-PHP_FUNCTION(imagecopy);
-PHP_FUNCTION(imagecopymerge);
-PHP_FUNCTION(imagecopyresized);
-PHP_FUNCTION(imagetypes);
-PHP_FUNCTION(imagecreate);
-PHP_FUNCTION(imageftbbox);
-PHP_FUNCTION(imagefttext);
-
-PHP_FUNCTION(imagecreatetruecolor);
-PHP_FUNCTION(imagetruecolortopalette);
-PHP_FUNCTION(imagepalettetotruecolor);
-PHP_FUNCTION(imagesetthickness);
-PHP_FUNCTION(imagefilledellipse);
-PHP_FUNCTION(imagefilledarc);
-PHP_FUNCTION(imagealphablending);
-PHP_FUNCTION(imagesavealpha);
-PHP_FUNCTION(imagecolorallocatealpha);
-PHP_FUNCTION(imagecolorresolvealpha);
-PHP_FUNCTION(imagecolorclosestalpha);
-PHP_FUNCTION(imagecolorexactalpha);
-PHP_FUNCTION(imagecopyresampled);
-
-#ifdef PHP_WIN32
-PHP_FUNCTION(imagegrabwindow);
-PHP_FUNCTION(imagegrabscreen);
-#endif
-
-PHP_FUNCTION(imagerotate);
-
-PHP_FUNCTION(imageflip);
-
-PHP_FUNCTION(imageantialias);
-
-PHP_FUNCTION(imagecrop);
-PHP_FUNCTION(imagecropauto);
-PHP_FUNCTION(imagescale);
-PHP_FUNCTION(imageaffine);
-PHP_FUNCTION(imageaffinematrixget);
-PHP_FUNCTION(imageaffinematrixconcat);
-PHP_FUNCTION(imagegetinterpolation);
-PHP_FUNCTION(imagesetinterpolation);
-
-PHP_FUNCTION(imagesetthickness);
-PHP_FUNCTION(imagecopymergegray);
-PHP_FUNCTION(imagesetbrush);
-PHP_FUNCTION(imagesettile);
-PHP_FUNCTION(imagesetstyle);
-
-PHP_FUNCTION(imagecreatefromstring);
-PHP_FUNCTION(imagecreatefromgif);
-PHP_FUNCTION(imagecreatefromjpeg);
-PHP_FUNCTION(imagecreatefromxbm);
-PHP_FUNCTION(imagecreatefromwebp);
-PHP_FUNCTION(imagecreatefrompng);
-PHP_FUNCTION(imagecreatefromwbmp);
-PHP_FUNCTION(imagecreatefromgd);
-PHP_FUNCTION(imagecreatefromgd2);
-PHP_FUNCTION(imagecreatefromgd2part);
-#if defined(HAVE_GD_BMP)
-PHP_FUNCTION(imagecreatefrombmp);
-#endif
-#if defined(HAVE_GD_TGA)
-PHP_FUNCTION(imagecreatefromtga);
-#endif
-#if defined(HAVE_GD_XPM)
-PHP_FUNCTION(imagecreatefromxpm);
-#endif
-
-PHP_FUNCTION(imagegammacorrect);
-PHP_FUNCTION(imagedestroy);
-PHP_FUNCTION(imagefill);
-PHP_FUNCTION(imagefilledpolygon);
-PHP_FUNCTION(imagefilledrectangle);
-PHP_FUNCTION(imagefilltoborder);
-PHP_FUNCTION(imagefontwidth);
-PHP_FUNCTION(imagefontheight);
-
-PHP_FUNCTION(imagegif );
-PHP_FUNCTION(imagejpeg );
-PHP_FUNCTION(imagepng);
-PHP_FUNCTION(imagewebp);
-PHP_FUNCTION(imagewbmp);
-PHP_FUNCTION(imagegd);
-PHP_FUNCTION(imagegd2);
-#if defined(HAVE_GD_BMP)
-PHP_FUNCTION(imagebmp);
-#endif
-
-PHP_FUNCTION(imageinterlace);
-PHP_FUNCTION(imageline);
-PHP_FUNCTION(imageloadfont);
-PHP_FUNCTION(imagepolygon);
-PHP_FUNCTION(imageopenpolygon);
-PHP_FUNCTION(imagerectangle);
-PHP_FUNCTION(imagesetpixel);
-PHP_FUNCTION(imagestring);
-PHP_FUNCTION(imagestringup);
-PHP_FUNCTION(imagesx);
-PHP_FUNCTION(imagesy);
-PHP_FUNCTION(imagesetclip);
-PHP_FUNCTION(imagegetclip);
-PHP_FUNCTION(imagedashedline);
-PHP_FUNCTION(imagettfbbox);
-PHP_FUNCTION(imagettftext);
-
-PHP_FUNCTION(imagecolormatch);
-
-PHP_FUNCTION(imagelayereffect);
-PHP_FUNCTION(imagexbm);
-
-PHP_FUNCTION(imagefilter);
-PHP_FUNCTION(imageconvolution);
-
-PHP_FUNCTION(imageresolution);
-
 PHP_GD_API int phpi_get_le_gd(void);
 
 #else