Fabian wrote:

Update of /cvsroot/monetdb/MonetDB/src/common In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26515

Modified Files: monet_options.mx monet_utils.mx Log Message: GCC on FreeBSD chokes on #if without a comparison, so use #ifdef/#ifndef instead

Index: monet_options.mx

RCS file: /cvsroot/monetdb/MonetDB/src/common/monet_options.mx,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- monet_options.mx 29 Oct 2007 20:09:08 -0000 1.20 +++ monet_options.mx 11 Dec 2007 12:30:25 -0000 1.21 @@ -95,7 +95,7 @@ #include <string.h> #include <ctype.h>

-#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H #include <unistd.h> #endif

@@ -104,7 +104,7 @@ # include "getopt1.c" #endif

-#if !HAVE_DECL_STRDUP +#ifndef HAVE_DECL_STRDUP

This is incorrect. Please revert. (And read the manual.)

#ifdef HAVE_STRDUP extern char *strdup(const char *); #else

Index: monet_utils.mx

RCS file: /cvsroot/monetdb/MonetDB/src/common/monet_utils.mx,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- monet_utils.mx 3 Apr 2007 08:54:37 -0000 1.33 +++ monet_utils.mx 11 Dec 2007 12:30:25 -0000 1.34 @@ -49,7 +49,7 @@ #include <stdarg.h> /* va_alist.. */

/* AIX requires this to be the first thing in the file. */ -#if HAVE_ALLOCA_H +#ifdef HAVE_ALLOCA_H # include <alloca.h> #else # ifdef _AIX

---

SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins