Changeset: 13c9a00d05da for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13c9a00d05da Modified Files: Branch: default Log Message:
Merged from Mar2011 diffs (25 lines): diff --git a/common/stream/stream.c b/common/stream/stream.c --- a/common/stream/stream.c +++ b/common/stream/stream.c @@ -92,8 +92,19 @@ #ifdef HAVE_LIBBZ2 #include <bzlib.h> #endif -#ifdef HAVE_MALLOC_H -#include <malloc.h> /* for alloca on Windows */ + +#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 #ifndef SHUT_RD _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
