Changeset: 5744957e6e39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5744957e6e39
Modified Files:
clients/mapilib/mapi.c
common/stream/stream.c
common/utils/msabaoth.c
common/utils/mutils.c
gdk/gdk_posix.c
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/mal/mal_linker.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.h
testing/difflib.c
Branch: cmake-fun
Log Message:
Windows has fcntl.h
diffs (202 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -692,6 +692,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#ifndef NATIVE_WIN32
# include <unistd.h>
# include <dirent.h>
@@ -699,7 +700,6 @@
# include <netdb.h>
# include <netinet/in.h>
# include <sys/uio.h>
-# include <fcntl.h>
#endif
#include <signal.h>
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -57,6 +57,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#ifdef NATIVE_WIN32
#include <io.h>
#else
@@ -66,7 +67,6 @@
# include <netinet/ip.h>
# include <netinet/tcp.h>
# include <netdb.h>
-# include <fcntl.h>
#endif
#ifdef HAVE_LIBZ
#include <zlib.h>
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -20,12 +20,12 @@
#include "monetdb_config.h"
#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#ifdef NATIVE_WIN32
#include <io.h>
#else
#include <unistd.h> /* unlink and friends */
#include <dirent.h> /* readdir, DIR */
-#include <fcntl.h>
#endif
#include <time.h>
#include <string.h> /* for getting error messages */
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -10,13 +10,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
+#include <fcntl.h>
#ifdef NATIVE_WIN32
#include <io.h>
#else
# include <unistd.h>
# include <sys/param.h> /* realpath on OSX, prerequisite of sys/sysctl on
OpenBSD */
# include <sys/sysctl.h> /* KERN_PROC_PATHNAME on BSD */
-# include <fcntl.h>
#endif
#include "mutils.h"
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -21,6 +21,7 @@
#include "mutils.h"
#include <string.h> /* strncpy */
#include <sys/types.h>
+#include <fcntl.h>
#ifdef __MACH__
# include <mach/task.h>
# include <mach/mach_init.h>
@@ -31,10 +32,8 @@
# include <sys/sysctl.h>
# include <sys/user.h>
#endif
-
#ifndef NATIVE_WIN32
# include <unistd.h>
-# include <fcntl.h>
# include <dlfcn.h>
#endif
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -34,11 +34,10 @@
#endif
#include <sys/types.h>
+#include <fcntl.h>
#ifdef NATIVE_WIN32
# include <io.h>
-#else
-# include <fcntl.h>
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -27,6 +27,7 @@ int GDKdebug = 0;
int GDKverbose = 0;
#include <signal.h>
+#include <fcntl.h>
#ifdef __CYGWIN__
#include <sysinfoapi.h>
@@ -41,7 +42,6 @@ int GDKverbose = 0;
#else
#include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
#include <sys/sysctl.h>
-#include <fcntl.h>
#endif
static ATOMIC_TYPE GDKstopped = ATOMIC_VAR_INIT(0);
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -19,12 +19,12 @@
#include "mutils.h"
#include <sys/types.h> /* opendir */
+#include <fcntl.h>
#ifdef NATIVE_WIN32
# include <io.h>
#else
#include <unistd.h>
#include <dirent.h>
-#include <fcntl.h>
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -34,6 +34,7 @@
#include <sys/types.h>
#include "stream_socket.h"
#include "mapi.h"
+#include <fcntl.h>
#ifdef HAVE_OPENSSL
# include <openssl/rand.h> /* RAND_bytes() */
#elif defined(HAVE_COMMONCRYPTO)
@@ -52,7 +53,6 @@
# include <netdb.h>
# include <netinet/in.h>
# include <sys/uio.h>
-# include <fcntl.h>
#endif
#define SOCKPTR struct sockaddr *
diff --git a/monetdb5/modules/mal/remote.h b/monetdb5/modules/mal/remote.h
--- a/monetdb5/modules/mal/remote.h
+++ b/monetdb5/modules/mal/remote.h
@@ -37,11 +37,10 @@ typedef struct _connection {
struct _connection *next; /* the next connection in the list */
} *connection;
-#ifndef WIN32
+#ifndef NATIVE_WIN32
#include <sys/socket.h> /* socket */
#include <sys/un.h> /* sockaddr_un */
-#else
-# include <unistd.h> /* gethostname */
+#include <unistd.h> /* gethostname */
#endif
/* #define _DEBUG_REMOTE_ trace the interaction */
diff --git a/testing/difflib.c b/testing/difflib.c
--- a/testing/difflib.c
+++ b/testing/difflib.c
@@ -15,6 +15,7 @@
#include <sys/stat.h>
#include <ctype.h>
#include <time.h>
+#include <fcntl.h>
#ifdef NATIVE_WIN32
# include <io.h>
@@ -23,7 +24,6 @@
#define getpid _getpid
#else
# include <unistd.h>
-# include <fcntl.h>
#endif
#ifndef DIFF
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
