summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/msapi/inttypes.h (renamed from plugins/MirLua/Modules/ffi/src/msvc/inttypes.h)0
-rw-r--r--plugins/Dbx_mdb/dbx_lmdb.vcxproj2
-rw-r--r--plugins/Dbx_mdb/src/lmdb/lmdb.h6
-rw-r--r--plugins/Dbx_mdb/src/lmdb/mdb.c6
-rw-r--r--plugins/Dbx_mdb/src/lmdb/midl.h6
-rw-r--r--plugins/MirLua/Modules/ffi/src/ffi.h2
6 files changed, 17 insertions, 5 deletions
diff --git a/plugins/MirLua/Modules/ffi/src/msvc/inttypes.h b/include/msapi/inttypes.h
index d7e251d1b4..d7e251d1b4 100644
--- a/plugins/MirLua/Modules/ffi/src/msvc/inttypes.h
+++ b/include/msapi/inttypes.h
diff --git a/plugins/Dbx_mdb/dbx_lmdb.vcxproj b/plugins/Dbx_mdb/dbx_lmdb.vcxproj
index b8b0406c35..fa4812577b 100644
--- a/plugins/Dbx_mdb/dbx_lmdb.vcxproj
+++ b/plugins/Dbx_mdb/dbx_lmdb.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
diff --git a/plugins/Dbx_mdb/src/lmdb/lmdb.h b/plugins/Dbx_mdb/src/lmdb/lmdb.h
index 41343879c1..747d2bbadd 100644
--- a/plugins/Dbx_mdb/src/lmdb/lmdb.h
+++ b/plugins/Dbx_mdb/src/lmdb/lmdb.h
@@ -166,7 +166,11 @@
#define _LMDB_H_
#include <sys/types.h>
-#include <inttypes.h>
+#if _MSC_VER < 1800
+# include <msapi/inttypes.h>
+#else
+# include <inttypes.h>
+#endif
#define MDB_VL32 1
diff --git a/plugins/Dbx_mdb/src/lmdb/mdb.c b/plugins/Dbx_mdb/src/lmdb/mdb.c
index a99e079c7f..4ea8982871 100644
--- a/plugins/Dbx_mdb/src/lmdb/mdb.c
+++ b/plugins/Dbx_mdb/src/lmdb/mdb.c
@@ -136,7 +136,11 @@ extern int cacheflush(char *addr, int nbytes, int cache);
#include <errno.h>
#include <limits.h>
#include <stddef.h>
-#include <inttypes.h>
+#if _MSC_VER < 1800
+# include <msapi/inttypes.h>
+#else
+# include <inttypes.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/plugins/Dbx_mdb/src/lmdb/midl.h b/plugins/Dbx_mdb/src/lmdb/midl.h
index b0d518ef03..91fa58f0fb 100644
--- a/plugins/Dbx_mdb/src/lmdb/midl.h
+++ b/plugins/Dbx_mdb/src/lmdb/midl.h
@@ -27,7 +27,11 @@
#define _MDB_MIDL_H_
#include <stddef.h>
-#include <inttypes.h>
+#if _MSC_VER < 1800
+# include <msapi/inttypes.h>
+#else
+# include <inttypes.h>
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/plugins/MirLua/Modules/ffi/src/ffi.h b/plugins/MirLua/Modules/ffi/src/ffi.h
index 577956b11d..48e5d2c761 100644
--- a/plugins/MirLua/Modules/ffi/src/ffi.h
+++ b/plugins/MirLua/Modules/ffi/src/ffi.h
@@ -15,7 +15,7 @@
#if _MSC_VER < 1800
# include "msvc/stdbool.h"
-# include "msvc/inttypes.h"
+# include <msapi/inttypes.h>
#else
# include <stdbool.h>
# include <inttypes.h>