Changeset: a2b5905c633a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2b5905c633a
Modified Files:
configure.ag
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/UDF/pyapi/pyheader.h
tools/merovingian/daemon/controlrunner.c
Branch: Jul2017
Log Message:
Include fcntl.h where we need it, compile on Solaris with Gentoo.
diffs (47 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -443,7 +443,7 @@ AS_CASE([$host],
# it disables, however, the availability of madvise, which is
# in use use by GDK, so we cannot just AC_DEFINE this, but
# rather have to enable it where it is necessary
- MSGCONTROL_FLAGS="-D_XOPEN_SOURCE=500"
+ MSGCONTROL_FLAGS="-D_XPG4_2"
AC_SUBST([MSGCONTROL_FLAGS])])
# (try to) determine compiler type (gcc, icc, clang) (and version)
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
@@ -61,6 +61,9 @@
#ifdef HAVE_SYS_UIO_H
# include <sys/uio.h>
#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#define SOCKPTR struct sockaddr *
#ifdef HAVE_SOCKLEN_T
diff --git a/sql/backends/monet5/UDF/pyapi/pyheader.h
b/sql/backends/monet5/UDF/pyapi/pyheader.h
--- a/sql/backends/monet5/UDF/pyapi/pyheader.h
+++ b/sql/backends/monet5/UDF/pyapi/pyheader.h
@@ -46,6 +46,7 @@
// Numpy Library
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_INTERNAL_BUILD 0
#ifdef __INTEL_COMPILER
// Intel compiler complains about trailing comma's in numpy source code,
#pragma warning(disable : 271)
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -19,6 +19,7 @@
#include <string.h> /* strerror */
#include <unistd.h> /* select */
#include <signal.h>
+#include <fcntl.h>
#include <errno.h>
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
