[mapserver-commits] r9298 - in trunk/mapserver: . mapscript/php3

[svn at osgeo.org]

Author: aboudreault
Date: 2009-09-12 16:38:18 -0400 (Sat, 12 Sep 2009)
New Revision: 9298

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php3/php_mapscript.c
Log:
Fixed build problem of PHP/Mapscript when php is compiled with gd as a shared extension (#3117)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-09-12 14:35:59 UTC (rev 9297)
+++ trunk/mapserver/HISTORY.TXT	2009-09-12 20:38:18 UTC (rev 9298)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed build problem of PHP/Mapscript when php is compiled with gd as
+  a shared extension (#3117)
+
 - Improve safety of srcx/y checks in nearest neighbour raster resampler (#3120)
 
 - Added support for 4d geometry types and oci bind variables for Oracle (#3107)

Modified: trunk/mapserver/mapscript/php3/php_mapscript.c
===================================================================
--- trunk/mapserver/mapscript/php3/php_mapscript.c	2009-09-12 14:35:59 UTC (rev 9297)
+++ trunk/mapserver/mapscript/php3/php_mapscript.c	2009-09-12 20:38:18 UTC (rev 9298)
@@ -47,6 +47,15 @@
 #include <errno.h>
 #endif
 
+/* All gd functions used in this extension (if they are renamed in the
+   "main/php_compat.h" file of php source) should be added here too for
+   compatibility reasons: when php compiles gd as a shared extention */
+#if defined(HAVE_GD_BUNDLED)
+#undef gdImageColorExact                                                                    
+#undef gdImageColorTransparent
+#undef gdImageCopy
+#endif
+
 #define PHPMS_VERSION "($Revision$ $Date$)"
 
 #ifndef DLEXPORT