Changeset: 9c7ae15b57cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c7ae15b57cc
Modified Files:
NT/Makefile
NT/monetdb_config.h.in
gdk/gdk_bbp.c
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (86 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -16,7 +16,7 @@ all: _all
!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
-_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h
unistd.h inttypes.h .monetdb
+_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h
unistd.h .monetdb
$(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
install: targetdirs all
@@ -46,14 +46,6 @@ unistd.h:
$(ECHO) #endif >> unistd.h
$(ECHO) #endif >> unistd.h
-inttypes.h:
- $(ECHO) typedef signed char int8_t; > inttypes.h
- $(ECHO) typedef unsigned char uint8_t; >> inttypes.h
- $(ECHO) typedef short int16_t; >> inttypes.h
- $(ECHO) typedef unsigned short uint16_t; >> inttypes.h
- $(ECHO) typedef int int32_t; >> inttypes.h
- $(ECHO) typedef unsigned int uint32_t; >> inttypes.h
-
.monetdb:
$(ECHO) user=monetdb> .monetdb
$(ECHO) password=monetdb>> .monetdb
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -148,7 +148,7 @@
/* #undef HAVE_FDATASYNC */
/* Define to 1 if you have the <fenv.h> header file. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER >= 1800
#define HAVE_FENV_H 1
#endif
@@ -234,7 +234,9 @@
/* #undef HAVE_IEEEFP_H */
/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1 /* generated by the Makefile */
+#if !defined(_MSC_VER) || _MSC_VER >= 1800
+#define HAVE_INTTYPES_H 1
+#endif
/* Define to 1 if you have the <io.h> header file. */
#define HAVE_IO_H 1
@@ -526,13 +528,15 @@
#define HAVE_SQLGETPRIVATEPROFILESTRING 1
/* Define to 1 if stdbool.h conforms to C99. */
-/* #undef HAVE_STDBOOL_H */
+#if !defined(_MSC_VER) || _MSC_VER >= 1800
+#define HAVE_STDBOOL_H 1
+#endif
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
#define HAVE_STDINT_H 1
#endif
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -76,6 +76,14 @@
#include "gdk_private.h"
#include "gdk_storage.h"
#include "mutils.h"
+
+#ifndef F_OK
+#define F_OK 0
+#endif
+#ifdef _MSC_VER
+#define access(f, m) _access(f, m)
+#endif
+
/*
* The BBP has a fixed address, so re-allocation due to a growing BBP
* caused by one thread does not disturb reads to the old entries by
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
