MFH: - Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc)

diff --git a/NEWS b/NEWS
index 454321ded6b019276b9e889fa5c350630f4dbe1f..84827b69fb381107fb459971672f25c6888046d4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ PHP                                                                        NEWS
 - Fixed bug #36224 (date(DATE_ATOM) gives wrong results). (Derick, Hannes
   Magnusson)
 - Fixed bug #36222 (errorInfo in PDOException is always NULL). (Ilia)
+- Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc)
 - Fixed bug #36185 (str_rot13(NULL) crash). (Pierre)
 - Fixed bug #36176 (PDO_PGSQL - PDO::exec() does not return number of rows 
   affected by the operation). (Ilia)

diff --git a/main/php_compat.h b/main/php_compat.h
index a2fef540a194891500ec94f77b8fa90d43f66063..8acbffb05ee43d25a239eae4c31c119e5578053e 100644 (file)
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -319,6 +319,12 @@
 #define term_source php_gd_term_source
 #define writewbmp php_gd_writewbmp
 #define ZeroDataBlock php_gd_ZeroDataBlock
+#define gdCacheCreate php_gd_gdCacheCreate
+#define gdCacheDelete php_gd_gdCacheDelete
+#define gdCacheGet php_gd_gdCacheGet
+#define gdFontCacheSetup php_gd_gdFontCacheSetup
+#define gdFontCacheShutdown php_gd_gdFontCacheShutdown
+#define gdFreeFontCache php_gd_gdFreeFontCache
 #endif /* HAVE_GD_BUNDLED */
 
 /* Define to specify how much context to retain around the current parse