Changeset: 6b333af0bc16 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b333af0bc16
Modified Files:
MonetDB/src/gdk/gdk_system.mx
Branch: Jun2010
Log Message:
include sys/time.h for FreeBSD for bug #2555, reorder includes such that the
documentation matches
(transplanted from d3455d727e7f05e5582cf85529658cbeb1a4e5d9)
diffs (44 lines):
diff -r d8a38d5f88d8 -r 6b333af0bc16 MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Sat Jun 12 20:04:52 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Sun Jun 13 10:35:09 2010 +0200
@@ -54,12 +54,12 @@
# include <io.h>
#endif
#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+# include <fcntl.h>
#endif
-
-...@- pthreads Includes and Definitions
-...@h
#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef HAVE_SYS_SYSCTL_H
# if defined(__OpenBSD__)
# include <sys/param.h>
@@ -69,7 +69,12 @@
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
+#if !(defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)) &&
defined(HAVE_GETRLIMIT) && defined(HAVE_SYS_RESOURCE_H)
+# include <sys/resource.h>
+#endif
+...@- pthreads Includes and Definitions
+...@h
#ifdef HAVE_PTHREAD_H
/* don't re-include config.h; on Windows, don't redefine pid_t in an
incompatible way
@@ -97,10 +102,6 @@
#define PTW32 1
#endif
-#if !(defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)) &&
defined(HAVE_GETRLIMIT) && defined(HAVE_SYS_RESOURCE_H)
-# include <sys/resource.h>
-#endif
-
/* debug and errno integers */
gdk_export int GDKdebug;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
