Changeset: 8b7d02cc9fca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b7d02cc9fca
Modified Files:
gdk/gdk_system.mx
gdk/gdk_utils.mx
Branch: default
Log Message:
Moved some include directives so that this compiles on Windows.
diffs (52 lines):
diff --git a/gdk/gdk_system.mx b/gdk/gdk_system.mx
--- a/gdk/gdk_system.mx
+++ b/gdk/gdk_system.mx
@@ -820,6 +820,23 @@
gdk_export int GDKms(void);
@c
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+#ifndef HAVE_GETTIMEOFDAY
+#ifdef HAVE_FTIME
+#include <sys/timeb.h>
+#endif
+#endif
+
lng
GDKusec(void)
{
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -53,21 +53,6 @@
#include <fcntl.h>
#endif
-#ifdef HAVE_FTIME
-#include <sys/timeb.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
