aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/calendar-model.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c492b5c001..dbc31ea167 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-14 Dan Winship <danw@helixcode.com>
+
+ * gui/calendar-model.c (_XOPEN_SOURCE): #define this to 500, not
+ nothing. Also, move this bit after the other #includes to
+ prevent potential messiness.
+
2000-12-13 Federico Mena Quintero <federico@helixcode.com>
* cal-util/cal-component.c (ensure_mandatory_properties): Even
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 6cf6501910..beb9f338c8 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -24,19 +24,19 @@
#include <config.h>
#include <math.h>
-/* We need this for strptime. */
#include <ctype.h>
-#define _XOPEN_SOURCE
-#define __USE_XOPEN
-#include <sys/time.h>
-#undef _XOPEN_SOURCE
-#undef __USE_XOPEN
#include <time.h>
#include <gnome.h>
#include <cal-util/timeutil.h>
#include "calendar-model.h"
#include "calendar-commands.h"
+/* We need this for strptime. */
+#define _XOPEN_SOURCE 500
+#define __USE_XOPEN
+#include <sys/time.h>
+#undef _XOPEN_SOURCE
+#undef __USE_XOPEN
/* Private part of the ECalendarModel structure */