--- libical/src/libical/icalyacc.c.orig	Mon Dec 10 21:44:24 2001
+++ libical/src/libical/icalyacc.c	Tue Apr  2 09:08:27 2002
@@ -23,8 +23,14 @@
 #define	SEMICOLON	266
 #define	MINUS	267
 #define	TIMESEPERATOR	268
+#ifdef TRUE
+#undef TRUE
 #define	TRUE	269
+#endif
+#ifdef FALSE
+#undef FALSE
 #define	FALSE	270
+#endif
 #define	FREQ	271
 #define	BYDAY	272
 #define	BYHOUR	273
--- libical/src/libical/icalyacc.h.orig	Mon Dec 10 21:44:24 2001
+++ libical/src/libical/icalyacc.h	Tue Apr  2 09:08:27 2002
@@ -15,8 +15,14 @@
 #define	SEMICOLON	266
 #define	MINUS	267
 #define	TIMESEPERATOR	268
+#ifdef TRUE
+#undef TRUE
 #define	TRUE	269
+#endif
+#ifdef FALSE
+#undef FALSE
 #define	FALSE	270
+#endif
 #define	FREQ	271
 #define	BYDAY	272
 #define	BYHOUR	273
--- libical/src/libical/icaltime.c.1.5	Mon Apr 29 16:19:38 2002
+++ libical/src/libical/icaltime.c	Mon Apr 29 17:04:39 2002
@@ -127,7 +127,7 @@
 
     if(orig_tzid!=0){	
 	size_t tmp_sz =strlen(orig_tzid)+4; 
-	char* orig_env_str = (char*)icalmemory_tmp_buffer(tmp_sz);
+	char* orig_env_str = (char*)malloc(tmp_sz);
 
 	if(orig_env_str == 0){
             icalerror_set_errno(ICAL_NEWFAILED_ERROR);