sniper Mon Mar 17 21:13:49 2003 EDT
Modified files:
/php4/ext/gd config.m4 gdcache.c
Log:
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.130 php4/ext/gd/config.m4:1.131
--- php4/ext/gd/config.m4:1.130 Sat Feb 1 20:34:54 2003
+++ php4/ext/gd/config.m4 Mon Mar 17 21:13:49 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.130 2003/02/02 01:34:54 helly Exp $
+dnl $Id: config.m4,v 1.131 2003/03/18 02:13:49 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.7 php4/ext/gd/gdcache.c:1.8
--- php4/ext/gd/gdcache.c:1.7 Thu Nov 21 21:38:03 2002
+++ php4/ext/gd/gdcache.c Mon Mar 17 21:13:49 2003
@@ -1,5 +1,5 @@
/*
- * $Id: gdcache.c,v 1.7 2002/11/22 02:38:03 iliaa Exp $
+ * $Id: gdcache.c,v 1.8 2003/03/18 02:13:49 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
