From 8c55d477d80f46f0dd5bf4d1086dc8e1f42cb30d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 1 Feb 2006 13:52:46 +0000 Subject: [PATCH] MFH: - Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc) --- NEWS | 1 + main/php_compat.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 454321ded6..84827b69fb 100644 --- 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 a2fef540a1..8acbffb05e 100644 --- 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 -- 2.40.0