Changeset: 6327e79aefa3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6327e79aefa3
Modified Files:
NT/monetdb_config.h.in
clients/mapiclient/mclient.c
Branch: Aug2011
Log Message:
On Windows, don't globally define timestamp/daylight with underscores.
On Windows, we need to use the _timestamp and _daylight "variables"
instead of timestamp and daylight. However, _timestamp is itself
defined as a function call, so we shouldn't define timestamp as
_timestamp globally because we use timestamp also as structure
members.
diffs (27 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -594,8 +594,6 @@
/* Define to 1 if you have the timezone and daylight variables. */
#define HAVE_TIMEZONE 1
-#define timezone _timezone
-#define daylight _daylight
/* Define to 1 if you have the `trunc' function. */
/* #undef HAVE_TRUNC */
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2362,6 +2362,11 @@ static void
set_timezone(Mapi mid)
{
#ifdef HAVE_TIMEZONE
+#ifdef _MSC_VER
+#define timezone _timezone
+#define daylight _daylight
+#define tzset _tzset
+#endif
char buf[128];
long tzone;
MapiHdl hdl;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
