Changeset: f3736a74c513 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3736a74c513
Modified Files:
gdk/gdk_storage.mx
gdk/gdk_system.mx
monetdb4/monet/monet_tbl.mx
monetdb5/mal/mal_linker.mx
Branch: default
Log Message:
Removed some seemingly unneeded includes.
diffs (86 lines):
diff --git a/gdk/gdk_storage.mx b/gdk/gdk_storage.mx
--- a/gdk/gdk_storage.mx
+++ b/gdk/gdk_storage.mx
@@ -49,6 +49,9 @@
#include "gdk.h"
#include <stdlib.h>
#include "gdk_storage.h"
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
@
@c
diff --git a/gdk/gdk_system.mx b/gdk/gdk_system.mx
--- a/gdk/gdk_system.mx
+++ b/gdk/gdk_system.mx
@@ -49,32 +49,6 @@
#define gdk_export extern
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* io functions */
-#endif
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#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>
-# endif
-# include <sys/sysctl.h>
-#endif
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-#if defined(HAVE_GETRLIMIT) && defined(HAVE_SYS_RESOURCE_H)
-# include <sys/resource.h>
-#endif
-
@- pthreads Includes and Definitions
@h
#ifdef HAVE_PTHREAD_H
@@ -252,6 +226,10 @@
#include "monetdb_config.h"
#include "gdk_system.h"
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+
MT_Lock MT_system_lock
#ifdef PTHREAD_MUTEX_INITIALIZER
= PTHREAD_MUTEX_INITIALIZER
diff --git a/monetdb4/monet/monet_tbl.mx b/monetdb4/monet/monet_tbl.mx
--- a/monetdb4/monet/monet_tbl.mx
+++ b/monetdb4/monet/monet_tbl.mx
@@ -182,6 +182,9 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#define dlPRINT(text) DLDEBUG THRprintf(GDKerr, text)
#define dlFPRINTF DLDEBUG THRprintf
diff --git a/monetdb5/mal/mal_linker.mx b/monetdb5/mal/mal_linker.mx
--- a/monetdb5/mal/mal_linker.mx
+++ b/monetdb5/mal/mal_linker.mx
@@ -99,6 +99,9 @@
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400
#define open _open
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
