Changeset: 0001c73e2195 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0001c73e2195
Modified Files:
CMakeLists.txt
gdk/gdk_logger.c
gdk/gdk_posix.h
gdk/gdk_utils.c
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.h
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Compilation fixes.
diffs (114 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -504,10 +504,10 @@ if(NOT HAVE_SIZEOF_SSIZE_T) # Set a defa
endif()
set(SIZEOF_SSIZE_T ${CMAKE_SIZEOF_VOID_P})
endif()
-check_type_size(char SIZEOF_CHAR LANGUAGE C)
-check_type_size(short SIZEOF_SHORT LANGUAGE C)
-check_type_size(int SIZEOF_INT LANGUAGE C)
-check_type_size(long SIZEOF_LNG LANGUAGE C)
+check_type_size(int8_t SIZEOF_BTE LANGUAGE C)
+check_type_size(int16_t SIZEOF_SHT LANGUAGE C)
+check_type_size(int32_t SIZEOF_INT LANGUAGE C)
+check_type_size(int64_t SIZEOF_LNG LANGUAGE C)
set(SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
check_type_size(wchar_t SIZEOF_WCHAR_T LANGUAGE C)
set(HAVE_HGE OFF CACHE INTERNAL "Huge integers are available" FORCE)
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -965,7 +965,7 @@ tr_commit(logger *lg, trans *tr)
return tr_destroy(tr);
}
-#ifdef _MSC_VER
+#ifdef NATIVE_WIN32
#define access _access
#endif
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -154,7 +154,7 @@ gdk_export int win_rename(const char *,
gdk_export int win_unlink(const char *);
gdk_export int win_mkdir(const char *, const int mode);
-#define _stat64 win_stat
+#define _stat64(x,y) win_stat(x,y)
#define mkdir win_mkdir
#define rmdir win_rmdir
#define rename win_rename
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -429,10 +429,10 @@ GDKinit(opt *set, int setlen)
char buf[16];
/* some sanity checks (should also find if symbols are not defined) */
- static_assert(sizeof(char) == SIZEOF_CHAR,
- "error in configure: bad value for SIZEOF_CHAR");
- static_assert(sizeof(short) == SIZEOF_SHORT,
- "error in configure: bad value for SIZEOF_SHORT");
+ static_assert(sizeof(bte) == SIZEOF_BTE,
+ "error in configure: bad value for SIZEOF_BTE");
+ static_assert(sizeof(sht) == SIZEOF_SHT,
+ "error in configure: bad value for SIZEOF_SHT");
static_assert(sizeof(int) == SIZEOF_INT,
"error in configure: bad value for SIZEOF_INT");
static_assert(sizeof(lng) == SIZEOF_LNG,
diff --git a/monetdb5/modules/mal/wlc.c b/monetdb5/modules/mal/wlc.c
--- a/monetdb5/modules/mal/wlc.c
+++ b/monetdb5/modules/mal/wlc.c
@@ -150,6 +150,10 @@
#include "mal_builder.h"
#include "wlc.h"
+#ifdef NATIVE_WIN32
+#define access _access
+#endif
+
MT_Lock wlc_lock = MT_LOCK_INITIALIZER("wlc_lock");
static char wlc_snapshot[FILENAME_MAX]; // The location of the snapshot
against which the logs work
diff --git a/monetdb5/modules/mal/wlc.h b/monetdb5/modules/mal/wlc.h
--- a/monetdb5/modules/mal/wlc.h
+++ b/monetdb5/modules/mal/wlc.h
@@ -33,9 +33,6 @@
#ifndef F_OK
#define F_OK 0
#endif
-#ifdef NATIVE_WIN32
-#define access _access
-#endif
mal_export MT_Lock wlc_lock;
mal_export char wlc_dir[FILENAME_MAX];
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -261,17 +261,17 @@
/* The home of R */
#cmakedefine RHOME "@RHOME@"
-/* The size of `char', as computed by sizeof. */
-#cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@
+/* The size of `int8_t', as computed by sizeof. */
+#cmakedefine SIZEOF_BTE @SIZEOF_BTE@
-/* The size of `int', as computed by sizeof. */
+/* The size of `int32_t', as computed by sizeof. */
#cmakedefine SIZEOF_INT @SIZEOF_INT@
-/* The size of `long', as computed by sizeof. */
+/* The size of `int64_t', as computed by sizeof. */
#cmakedefine SIZEOF_LNG @SIZEOF_LNG@
-/* The size of `short', as computed by sizeof. */
-#cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@
+/* The size of `int16_t', as computed by sizeof. */
+#cmakedefine SIZEOF_SHT @SIZEOF_SHT@
/* The size of `size_t', as computed by sizeof. */
#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
