Changeset: 9b8c2752a58d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b8c2752a58d Modified Files: clients/mapiclient/mclient.c configure.ag Branch: default Log Message:
Merge with Mar2011 branch. diffs (84 lines): diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -45,20 +45,6 @@ #include <strings.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 - #ifdef HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/common/stream/stream.c b/common/stream/stream.c --- a/common/stream/stream.c +++ b/common/stream/stream.c @@ -93,20 +93,6 @@ #include <bzlib.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 - #ifndef SHUT_RD #define SHUT_RD 0 #define SHUT_WR 1 diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -3085,20 +3085,18 @@ #define _SEEN_MONETDB_CONFIG_H 1 /* AC_FUNC_ALLOCA autoconf documented code */ -/* AIX requires this to be the first thing in the file after - * preprocessor statements */ -#ifndef __GNUC__ -# if HAVE_ALLOCA_H -# include <alloca.h> -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# 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 #ifdef HAVE_SYS_TYPES_H _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
