File libical-0.46-fix-fatal-error-macro-usage.patch of Package libical

Overview Repositories Revisions Requests Users Attributes Meta

File libical-0.46-fix-fatal-error-macro-usage.patch of Package libical

Index: trunk/libical/src/libical/autogenex/ical.h
===================================================================
--- trunk/libical/src/libical/autogenex/ical.h	(revision 1041)
+++ trunk/libical/src/libical/autogenex/ical.h	(revision 1042)
@@ -3272,7 +3272,7 @@
 void icalerror_set_errno(icalerrorenum x);
 #endif
 
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL == 1
 #undef NDEBUG
 #endif
 
@@ -3282,7 +3282,7 @@
 #define icalerror_check_component_type(value,type);
 
 /* Assert with a message */
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL == 1
 
 #ifdef __GNUC__
 #define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();}
Index: trunk/libical/src/libical/icalparser.c
===================================================================
--- trunk/libical/src/libical/icalparser.c	(revision 1041)
+++ trunk/libical/src/libical/icalparser.c	(revision 1042)
@@ -930,10 +930,7 @@
 
                 /* Change for mozilla */
                 /* have the option of being flexible towards unsupported parameters */
-                #ifndef ICAL_ERRORS_ARE_FATAL
-                continue;
-                #endif
-
+		#if ICAL_ERRORS_ARE_FATAL == 1
 		insert_error(tail, str, "Cant parse parameter name",
 			     ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
 		tail = 0;
@@ -947,6 +944,9 @@
 			name = 0;
 		}
 		return 0;
+		#else
+		continue;
+		#endif
 	    }
 
 	    /* if (pvalue) {
Index: trunk/libical/src/libical/icalerror.h
===================================================================
--- trunk/libical/src/libical/icalerror.h	(revision 1041)
+++ trunk/libical/src/libical/icalerror.h	(revision 1042)
@@ -121,7 +121,7 @@
 void icalerror_set_errno(icalerrorenum x); 
 #endif
 
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL == 1
 #undef NDEBUG
 #endif
 
@@ -131,7 +131,7 @@
 #define icalerror_check_component_type(value,type);
 
 /* Assert with a message */
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL == 1
 
 #ifdef __GNUC__
 #define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();}

Places

File libical-0.46-fix-fatal-error-macro-usage.patch of Package libical

Places