jorton          Wed Feb  1 13:10:04 2006 UTC

  Modified files:              
    /php-src/main       php_compat.h 
  Log:
  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.26&r2=1.27&diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.26 php-src/main/php_compat.h:1.27
--- php-src/main/php_compat.h:1.26      Sun Jan  1 13:09:57 2006
+++ php-src/main/php_compat.h   Wed Feb  1 13:10:04 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_compat.h,v 1.26 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php_compat.h,v 1.27 2006/02/01 13:10:04 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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to