From 0fca4b50905d5e301d67f01c862e1b7e03754974 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Thu, 16 Jun 2016 07:45:02 +0000
Subject: vc2010 compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@16988 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Dbx_mdb/dbx_lmdb.vcxproj               |  2 +-
 plugins/Dbx_mdb/src/lmdb/lmdb.h                |  6 ++++-
 plugins/Dbx_mdb/src/lmdb/mdb.c                 |  6 ++++-
 plugins/Dbx_mdb/src/lmdb/midl.h                |  6 ++++-
 plugins/MirLua/Modules/ffi/src/ffi.h           |  2 +-
 plugins/MirLua/Modules/ffi/src/msvc/inttypes.h | 31 --------------------------
 6 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 plugins/MirLua/Modules/ffi/src/msvc/inttypes.h

(limited to 'plugins')

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>
diff --git a/plugins/MirLua/Modules/ffi/src/msvc/inttypes.h b/plugins/MirLua/Modules/ffi/src/msvc/inttypes.h
deleted file mode 100644
index d7e251d1b4..0000000000
--- a/plugins/MirLua/Modules/ffi/src/msvc/inttypes.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-/* Signed integers */
-#define PRId8   "d"
-#define PRId16  "d"
-#define PRId32  "d"
-#define PRId64  "I64d"
-#define PRIi8   "i"
-#define PRIi16  "i"
-#define PRIi32  "i"
-#define PRIi64  "I64i"
-
-/* Unsigned integers */
-#define PRIo8   "o"
-#define PRIo16  "o"
-#define PRIo32  "o"
-#define PRIo64  "I64o"
-#define PRIu8   "u"
-#define PRIu16  "u"
-#define PRIu32  "u"
-#define PRIu64  "I64u"
-#define PRIx8   "x"
-#define PRIx16  "x"
-#define PRIx32  "x"
-#define PRIx64  "I64x"
-#define PRIX8   "X"
-#define PRIX16  "X"
-#define PRIX32  "X"
-#define PRIX64  "I64X"
-#define PRIxPTR PRIx32
-#define PRIXPTR PRIX32
-- 
cgit v1.2.3