Fix fucking CVS conflicts because fucking CVS is a fucking big doofus - Federico

svn path=/trunk/; revision=6920

4 files changed, 15 insertions, 9 deletions

diff --git a/libical/scripts/mkderivedparameters.pl b/libical/scripts/mkderivedparameters.pl
index 2b505c878a..5715220ea3 100755
--- a/libical/scripts/mkderivedparameters.pl
+++ b/libical/scripts/mkderivedparameters.pl
@@ -272,6 +272,6 @@ EOM
 if ($opt_h){
 
 print <<EOM;
-#endif ICALPARAMETER_H
+#endif /*ICALPARAMETER_H*/
 EOM
 }
diff --git a/libical/scripts/mkderivedproperties.pl b/libical/scripts/mkderivedproperties.pl
index 010e35d178..9778c30a77 100755
--- a/libical/scripts/mkderivedproperties.pl
+++ b/libical/scripts/mkderivedproperties.pl
@@ -30,6 +30,7 @@ while (<F>){
   my @v = split(/\t+/,$_);  
   
   my $value = shift @v;
+  my $mode = shift @v;
   my $type = shift @v;
   my $comment = join(" ",@v);
 
@@ -284,7 +285,7 @@ if ($opt_p)
 if ($opt_h){
 
 print <<EOM;
-#endif ICALPROPERTY_H
+#endif /*ICALPROPERTY_H*/
 EOM
 }
 
diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl
index 103c54a8e2..a04928ab59 100755
--- a/libical/scripts/mkderivedvalues.pl
+++ b/libical/scripts/mkderivedvalues.pl
@@ -128,6 +128,7 @@ while(<F>)
   my @v = split(/\t+/,$_);  
   
   my $value = shift @v;
+  my $mode = shift @v;
   my $type = shift @v;
   my $comment = join(" ",@v);
   
@@ -155,7 +156,7 @@ while(<F>)
     $union_data = $lc;
   }
 
-  if ($opt_c) {
+  if ($opt_c && $mode eq "std") {
 print <<EOM;
 
 icalvalue*
@@ -182,7 +183,7 @@ icalvalue_set_${lc}(icalvalue* value, $type v)
 EOM
 
 if( ${union_data} eq 'string'){
-print"    if(impl->data.v_${union_data}!=0) {free(impl->data.v_${union_data});}\n";
+print"    if(impl->data.v_${union_data}!=0) {free((void*)impl->data.v_${union_data});}\n";
 }
 
 print <<EOM;
@@ -216,15 +217,15 @@ EOM
 if ( $ud{$union_data}++ == 0) {
 
 print<<EOM;
-char* icalvalue_${union_data}_as_ical_string(icalvalue* value) {
+const char* icalvalue_${union_data}_as_ical_string(icalvalue* value) {
 
     $type data;
     char temp[1024];
     char *str;
-    icalerror_check_arg( (value!=0),"value");
+    icalerror_check_airg( (value!=0),"value");
     data = ((struct icalvalue_impl*)value)->data.v_${union_data}
 
-    str = strdup(temp);
+    str = icalmemory_strdup(temp);
 
     return str;
 }
@@ -306,7 +307,7 @@ if ($opt_p)
 if ($opt_h){
 
 print <<EOM;
-#endif ICALVALUE_H
+#endif /*ICALVALUE_H*/
 EOM
 }
 
diff --git a/libical/scripts/mkrestrictiontable.pl b/libical/scripts/mkrestrictiontable.pl
index 1dab5709b9..e1e1a0ca53 100755
--- a/libical/scripts/mkrestrictiontable.pl
+++ b/libical/scripts/mkrestrictiontable.pl
@@ -46,10 +46,12 @@ while(<F>)
   
   if(!$sub) {
     $sub = "0";
+  } else {
+    $sub = "icalrestriction_".$sub;
   }
 
   if($prop ne "NONE"){
-    print("    \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${prop}_PROPERTY,ICAL_RESTRICTION_${restr},$sub\},\n");
+    print("    \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${prop}_PROPERTY,ICAL_RESTRICTION_${restr},$sub},\n");
   }
 
 }
@@ -80,6 +82,8 @@ while(<F>)
   
   if(!$sub) {
     $sub = "0";
+  } else {
+    $sub = "icalrestriction_".$sub;
   }