[mapserver-commits] r11713 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-16 06:36:03 -0700 (Mon, 16 May 2011)
New Revision: 11713

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapunion.c
Log:
Fixed the build problem in mapunion.c (#3877)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-14 20:34:13 UTC (rev 11712)
+++ trunk/mapserver/HISTORY.TXT	2011-05-16 13:36:03 UTC (rev 11713)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 ------------------------------------------------- 
 
+- Fixed the build problem in mapunion.c (#3877)
+
 - Implement to get all shapes with the clustered layer (#3873)
 
 - Union layer: Fixed the crash when styling source layers using attributes (#3870)

Modified: trunk/mapserver/mapunion.c
===================================================================
--- trunk/mapserver/mapunion.c	2011-05-14 20:34:13 UTC (rev 11712)
+++ trunk/mapserver/mapunion.c	2011-05-16 13:36:03 UTC (rev 11713)
@@ -315,7 +315,7 @@
         {
             /* get items requested by the union layer plus the required items */
             msLayerSetProcessingKey(srclayer, "ITEMS", itemlist);
-            if (msLayerWhichItems(srclayer, TRUE, NULL) != MS_SUCCESS)
+            if (msLayerWhichItems(srclayer, MS_TRUE, NULL) != MS_SUCCESS)
             {
                 msFree(itemlist);
                 return MS_FAILURE;
@@ -324,7 +324,7 @@
         else
         {
             /* get only the required items */
-            if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)
+            if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)
                 return MS_FAILURE;
         }
     }
@@ -353,7 +353,7 @@
             msUnionLayerFreeExpressionTokens(srclayer);
             
             /* get only the required items */
-            if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)
+            if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)
                 return MS_FAILURE;
         }