Changeset: 4610e20b9c8f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4610e20b9c8f
Modified Files:
clients/mapilib/mapi.c
configure.ag
gdk/gdk_bbp.mx
gdk/gdk_heap.mx
gdk/gdk_logger.mx
gdk/gdk_rangejoin.mx
gdk/gdk_setop.mx
gdk/gdk_ssort.mx
gdk/gdk_utils.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
Branch: default
Log Message:
Merged from Apr2011
diffs (86 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -800,20 +800,6 @@
#include <malloc.h>
#endif
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-void *alloca(size_t);
-#endif
-
#include <signal.h>
#include <string.h>
#include <memory.h>
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -48,6 +48,8 @@
BAT *GDKenv = NULL;
+#include <signal.h>
+
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
@@ -60,6 +62,17 @@
# include <sys/sysctl.h>
#endif
+/* getrlimit on FreeBSD */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
#ifdef NATIVE_WIN32
#define chdir _chdir
#endif
@@ -257,7 +270,6 @@
received.
@{
@c
-#include <signal.h>
#if 0 /* these are unused */
static void
BATSIGignore(int nr)
diff --git a/monetdb5/misc/msabaoth.c b/monetdb5/misc/msabaoth.c
--- a/monetdb5/misc/msabaoth.c
+++ b/monetdb5/misc/msabaoth.c
@@ -42,20 +42,6 @@
#include <string.h> /* for getting error messages */
#include <assert.h>
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-void *alloca(size_t);
-#endif
-
#include "msabaoth.h"
#include "mutils.h"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
