cvs: php-src(PHP_5_1) / NEWS /main php_compat.h

jorton Wed Feb 1 13:52:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main php_compat.h /php-src NEWS Log: MFH: - Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc) http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.25.2.1&r2=1.25.2.2&diff_format=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.25.2.1 php-src/main/php_compat.h:1.25.2.2 --- php-src/main/php_compat.h:1.25.2.1 Sun Jan 1 12:50:17 2006 +++ php-src/main/php_compat.h Wed Feb 1 13:52:46 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_compat.h,v 1.25.2.1 2006/01/01 12:50:17 sniper Exp $ */ +/* $Id: php_compat.h,v 1.25.2.2 2006/02/01 13:52:46 jorton Exp $ */ #ifndef PHP_COMPAT_H #define 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 http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.389&r2=1.2027.2.390&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.389 php-src/NEWS:1.2027.2.390 --- php-src/NEWS:1.2027.2.389 Wed Feb 1 10:31:57 2006 +++ php-src/NEWS Wed Feb 1 13:52:46 2006 @@ -24,6 +24,7 @@ - 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)