From 73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@src.gnome.org>
Date: Thu, 24 Aug 2000 20:12:06 +0000
Subject: Fix minor conflicts.

svn path=/trunk/; revision=5017
---
 libical/scripts/mkderivedvalues.pl | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'libical/scripts')

diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl
index ca2ee4b3a1..103c54a8e2 100755
--- a/libical/scripts/mkderivedvalues.pl
+++ b/libical/scripts/mkderivedvalues.pl
@@ -179,6 +179,14 @@ icalvalue_set_${lc}(icalvalue* value, $type v)
     icalerror_check_value_type(value, ICAL_${uc}_VALUE);
 
     impl = (struct icalvalue_impl*)value;
+EOM
+
+if( ${union_data} eq 'string'){
+print"    if(impl->data.v_${union_data}!=0) {free(impl->data.v_${union_data});}\n";
+}
+
+print <<EOM;
+
     impl->data.v_${union_data} = $assign
 }
 
-- 
cgit v1.2.3