Changeset: f622094a8a19 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f622094a8a19 Modified Files: clients/mapilib/mapi.c common/stream/stream.h monetdb_config.h.in tools/merovingian/daemon/handlers.h Branch: cmake-fun Log Message:
Older versions of GCC don't have the __has_attribute macro. Sorry for my lack of experience. Also removed unused signal.h includes. diffs (53 lines): diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c --- a/clients/mapilib/mapi.c +++ b/clients/mapilib/mapi.c @@ -702,7 +702,6 @@ # include <sys/uio.h> #endif -#include <signal.h> #include <time.h> #ifdef HAVE_FTIME # include <sys/timeb.h> /* ftime */ diff --git a/common/stream/stream.h b/common/stream/stream.h --- a/common/stream/stream.h +++ b/common/stream/stream.h @@ -26,7 +26,6 @@ # include <unistd.h> #endif #include <ctype.h> -#include <signal.h> #include <limits.h> /* avoid using "#ifdef WIN32" so that this file does not need our config.h */ diff --git a/monetdb_config.h.in b/monetdb_config.h.in --- a/monetdb_config.h.in +++ b/monetdb_config.h.in @@ -431,8 +431,13 @@ #cmakedefine _LARGE_FILES #endif -/* Does your compiler support `__attribute__'? */ -#if !defined(__has_attribute) && !defined(__attribute__) +/* Does your compiler support `__has_attribute' macro? */ +#ifndef __has_attribute +#define __has_attribute(a) 0 +#endif + +/* Does your compiler support `__attribute__' extension? */ +#if !defined(__GNUC__) && !defined(__clang__) && !defined(__attribute__) #define __attribute__(a) #endif diff --git a/tools/merovingian/daemon/handlers.h b/tools/merovingian/daemon/handlers.h --- a/tools/merovingian/daemon/handlers.h +++ b/tools/merovingian/daemon/handlers.h @@ -9,8 +9,6 @@ #ifndef _HANDLERS_H #define _HANDLERS_H 1 -#include <signal.h> - void handler(int sig); void huphandler(int sig); void childhandler(void); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
