Changeset: 146c2592ee44 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=146c2592ee44
Modified Files:
CMakeLists.txt
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Compilation fixes.
diffs (42 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ include(CheckCSourceCompiles REQUIRED)
include(CheckCSourceRuns REQUIRED)
include(CheckIncludeFile REQUIRED)
include(CheckIncludeFiles REQUIRED)
+include(CMakePushCheckState REQUIRED)
include(CheckStructHasMember REQUIRED)
include(CheckSymbolExists REQUIRED)
include(CheckTypeSize REQUIRED)
@@ -235,6 +236,7 @@ check_c_source_compiles("
set(FLEXIBLE_ARRAY_MEMBER ON) # We compile according to C99 standard
if(MSVC)
set(__attribute__(a) ON)
+ set(restrict __restrict)
endif()
#
https://github.com/Unidata/netcdf-c/commit/b432a527c4a38af45498691a44c5a88961b9c751
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -667,7 +667,9 @@
#cmakedefine VERSION "@VERSION@"
/* Define on Microsoft Windows (also under Cygwin) */
+#ifndef WIN32
#cmakedefine WIN32
+#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -711,6 +713,9 @@
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#cmakedefine inline
+#ifndef restrict
+#cmakedefine restrict @restrict@
+#endif
#endif
/* Define to `long int' if <sys/types.h> does not define. */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
