aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/src/libical/Makefile.am7
-rw-r--r--libical/src/libical/icaltime.c11
2 files changed, 9 insertions, 9 deletions
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 0348ea9b4c..daf0e5607e 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -11,6 +11,8 @@ YFLAGS = -d -v -t -pical_yy
LFLAGS = -Pical_yy
LEX_OUTPUT_ROOT = lex.ical_yy
+all: ical.h
+
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir)/src \
@@ -19,8 +21,6 @@ INCLUDES = \
libical_la_LDFLAGS = -version-info 0:0:0
-icalcomponent.c: icalproperty.h icalvalue.h icalparameter.h
-
libical_la_SOURCES = \
icalcomponent.c \
icalcomponent.h \
@@ -85,7 +85,6 @@ COMBINEDHEADERS = \
$(top_srcdir)/src/libical/icallangbind.h
BUILT_SOURCES = \
- ical.h \
icalparameter.c \
icalparameter.h \
icalproperty.c \
@@ -94,7 +93,7 @@ BUILT_SOURCES = \
icalvalue.c \
icalvalue.h
-ical.h: $(COMBINEDHEADERS)
+ical.h: $(COMBINEDHEADERS) $(BUILT_SOURCES)
cat $(COMBINEDHEADERS) \
| egrep -v "#include.*\"ical" \
| egrep -v "#include.*\"pvl\.h\"" > ical.h
diff --git a/libical/src/libical/icaltime.c b/libical/src/libical/icaltime.c
index b3d9353f32..b3c94229bf 100644
--- a/libical/src/libical/icaltime.c
+++ b/libical/src/libical/icaltime.c
@@ -125,7 +125,7 @@ char* set_tz(const char* tzid)
return old_tz_copy; /* This will be zero if the TZ env var was not set */
}
-void unset_tz(struct set_tz_save savetz)
+void unset_tz(char *tzstr)
{
/* restore the original environment */
@@ -165,7 +165,7 @@ time_t icaltime_as_timet(struct icaltimetype tt)
stm.tm_isdst = -1;
if(tt.is_utc == 1 || tt.is_date == 1){
- struct set_tz_save old_tz = set_tz("UTC");
+ char* old_tz = set_tz("UTC");
t = mktime(&stm);
unset_tz(old_tz);
} else {
@@ -243,10 +243,11 @@ int icaltime_utc_offset(struct icaltimetype ictt, const char* tzid)
time_t tt = icaltime_as_timet(ictt);
time_t offset_tt;
struct tm gtm;
- struct set_tz_save old_tz;
+
+ char *tzstr = 0;
if(tzid != 0){
- old_tz = set_tz(tzid);
+ tzstr = set_tz(tzid);
}
/* Mis-interpret a UTC broken out time as local time */
@@ -255,7 +256,7 @@ int icaltime_utc_offset(struct icaltimetype ictt, const char* tzid)
offset_tt = mktime(&gtm);
if(tzid != 0){
- unset_tz(old_tz);
+ unset_tz(tzstr);
}
return tt-offset_tt;