[mapserver-commits] r11714 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-16 06:38:19 -0700 (Mon, 16 May 2011)
New Revision: 11714

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapunion.c
Log:
Fixed the build problem in mapunion.c (#3877)


Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-16 13:36:03 UTC (rev 11713)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-16 13:38:19 UTC (rev 11714)
@@ -15,6 +15,8 @@
 Version 6.0.1 (SVN branch-6-0):
 ---------------------------
 
+- Fixed the build problem in mapunion.c (#3877)
+
 - Union layer: Fixed the crash when styling source layers using attributes (#3870)
 
 Version 6.0.0 (2011-05-11)

Modified: branches/branch-6-0/mapserver/mapunion.c
===================================================================
--- branches/branch-6-0/mapserver/mapunion.c	2011-05-16 13:36:03 UTC (rev 11713)
+++ branches/branch-6-0/mapserver/mapunion.c	2011-05-16 13:38:19 UTC (rev 11714)
@@ -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;
         }