[mapserver-commits] r12114 - in trunk/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2011-08-25 07:33:27 -0700 (Thu, 25 Aug 2011)
New Revision: 12114

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php/php_mapscript.h
Log:
Fix mapscript to build when TRUE macro is not defined (#3926)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-08-25 14:02:51 UTC (rev 12113)
+++ trunk/mapserver/HISTORY.TXT	2011-08-25 14:33:27 UTC (rev 12114)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- Fix mapscript to build when TRUE macro is not defined (#3926)
+
 - Fix mapscript php build issues with MSVC (#4004)
 
 - PHP MapScript is missing many styleObj properties (#3901)

Modified: trunk/mapserver/mapscript/php/php_mapscript.h
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript.h	2011-08-25 14:02:51 UTC (rev 12113)
+++ trunk/mapserver/mapscript/php/php_mapscript.h	2011-08-25 14:33:27 UTC (rev 12114)
@@ -68,6 +68,11 @@
 	zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")
 #endif
 
+/* it looks like that macro is not always defined: ticket #3926 */
+#ifndef TRUE
+#define TRUE 1
+#endif
+
 /* Taken from the CAIRO php extension */
 /* turn error handling to exception mode and restore */
 #if defined(PHP_VERSION_ID) && PHP_VERSION_ID >= 50300