[mapserver-commits] r12115 - in branches/branch-6-0/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2011-08-25 07:36:25 -0700 (Thu, 25 Aug 2011)
New Revision: 12115

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h
Log:
Backport 6.0: Fix mapscript to build when TRUE macro is not defined (#3926)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-08-25 14:33:27 UTC (rev 12114)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-08-25 14:36:25 UTC (rev 12115)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
 
+- Fix mapscript to build when TRUE macro is not defined (#3926)
+
 - Fix mapscript php build issues with MSVC (#4004)
 
 - PHP/Mapscript: Segmentation fault when getting complex object using PHP 5.2 (#3930)

Modified: branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h	2011-08-25 14:33:27 UTC (rev 12114)
+++ branches/branch-6-0/mapserver/mapscript/php/php_mapscript.h	2011-08-25 14:36:25 UTC (rev 12115)
@@ -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
+
 #ifndef Z_ADDREF_P
 #define Z_ADDREF_P(pz)                (pz)->refcount++
 #endif