From 4434f6e4d64690f533798ad192a6cb29f3b7bb2d5704ee660d265c4647e1e029 Mon Sep 17 00:00:00 2001
From: Bjoern Schilberg <bjoern@intevation.de>
Date: Tue, 31 May 2011 06:31:04 +0000
Subject: [PATCH] Reworked the patch a little

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=76
---
 patch_3877-r11714.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/patch_3877-r11714.patch b/patch_3877-r11714.patch
index cc8f55b..5896375 100644
--- a/patch_3877-r11714.patch
+++ b/patch_3877-r11714.patch
@@ -1,6 +1,15 @@
 diff -urNad mapserver-6.0.0~/mapunion.c mapserver-6.0.0/mapunion.c
 --- mapserver-6.0.0/mapunion.c	(revision 11709)
 +++ mapserver-6.0.0/mapunion.c	(revision 11714)
+@@ -236,7 +236,7 @@
+ }
+
+ /* clean up expression tokens */
+-void msUnionLayerFreeExpressionTokens(layerObj *layer)
++int msUnionLayerFreeExpressionTokens(layerObj *layer)
+ {
+     int i,j;
+     freeExpressionTokens(&(layer->filter));
 @@ -316,5 +316,5 @@
              /* get items requested by the union layer plus the required items */
              msLayerSetProcessingKey(srclayer, "ITEMS", itemlist);