sniper          Mon Mar 17 21:14:22 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/gd        config.m4 gdcache.c 
  Log:
  MFH: Fixed bug #22751 (Compile error in gdcache when external libgd is used)
  
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.120.2.9 php4/ext/gd/config.m4:1.120.2.10
--- php4/ext/gd/config.m4:1.120.2.9     Tue Mar 11 20:02:39 2003
+++ php4/ext/gd/config.m4       Mon Mar 17 21:14:22 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.120.2.9 2003/03/12 01:02:39 iliaa Exp $
+dnl $Id: config.m4,v 1.120.2.10 2003/03/18 02:14:22 sniper Exp $
 dnl
 
 dnl
@@ -245,6 +245,7 @@
   PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB,     
1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageColorResolve,    [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 
1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageGifCtx,          [AC_DEFINE(HAVE_GD_GIF_CTX,          
1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdCacheCreate,          [AC_DEFINE(HAVE_GD_CACHE_CREATE,     
1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
 ])
 
 dnl
Index: php4/ext/gd/gdcache.c
diff -u php4/ext/gd/gdcache.c:1.5.2.1 php4/ext/gd/gdcache.c:1.5.2.2
--- php4/ext/gd/gdcache.c:1.5.2.1       Wed Mar  5 11:04:20 2003
+++ php4/ext/gd/gdcache.c       Mon Mar 17 21:14:22 2003
@@ -1,5 +1,5 @@
 /* 
- * $Id: gdcache.c,v 1.5.2.1 2003/03/05 16:04:20 iliaa Exp $
+ * $Id: gdcache.c,v 1.5.2.2 2003/03/18 02:14:22 sniper Exp $
  *
  * Caches of pointers to user structs in which the least-recently-used 
  * element is replaced in the event of a cache miss after the cache has 
@@ -44,7 +44,7 @@
 #else
 #include "php_config.h"
 #endif
-#if HAVE_LIBTTF|HAVE_LIBFREETYPE
+#if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE)
 
 #include "gdcache.h"
 



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

Reply via email to