aboutsummaryrefslogtreecommitdiffstats
path: root/libical/scripts
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2000-08-25 04:12:06 +0800
committerJP Rosevear <jpr@src.gnome.org>2000-08-25 04:12:06 +0800
commit73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a (patch)
tree5be6b34646e168f530ae5cf818a19d5b4be1bd73 /libical/scripts
parent37471a4d5261636aea1a330ed2c42db9e665a9f9 (diff)
downloadgsoc2013-evolution-73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a.tar.gz
gsoc2013-evolution-73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a.tar.zst
gsoc2013-evolution-73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a.zip
Fix minor conflicts.
svn path=/trunk/; revision=5017
Diffstat (limited to 'libical/scripts')
-rwxr-xr-xlibical/scripts/mkderivedvalues.pl8
1 files changed, 8 insertions, 0 deletions
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
}