forked from bartvdbraak/blender
Fix compilation error with msvc2012 and 2013 as well
This commit is contained in:
parent
d291d15c19
commit
9896508e14
8
extern/carve/include/carve/win32.h
vendored
Executable file → Normal file
8
extern/carve/include/carve/win32.h
vendored
Executable file → Normal file
@ -46,9 +46,6 @@ typedef signed __int32 int32_t;
|
|||||||
typedef unsigned __int8 uint8_t;
|
typedef unsigned __int8 uint8_t;
|
||||||
typedef unsigned __int16 uint16_t;
|
typedef unsigned __int16 uint16_t;
|
||||||
typedef unsigned __int32 uint32_t;
|
typedef unsigned __int32 uint32_t;
|
||||||
|
|
||||||
# include <BaseTsd.h>
|
|
||||||
typedef SSIZE_T ssize_t;
|
|
||||||
#endif
|
#endif
|
||||||
typedef __int64 int64_t;
|
typedef __int64 int64_t;
|
||||||
typedef unsigned __int64 uint64_t;
|
typedef unsigned __int64 uint64_t;
|
||||||
@ -56,3 +53,8 @@ typedef unsigned __int64 uint64_t;
|
|||||||
# include <stdint.h>
|
# include <stdint.h>
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
# include <BaseTsd.h>
|
||||||
|
typedef SSIZE_T ssize_t;
|
||||||
|
#endif
|
||||||
|
15
extern/carve/patches/win32.patch
vendored
15
extern/carve/patches/win32.patch
vendored
@ -1,7 +1,7 @@
|
|||||||
diff -r e82d852e4fb0 include/carve/win32.h
|
diff -r e82d852e4fb0 include/carve/win32.h
|
||||||
--- a/include/carve/win32.h Wed Jan 15 13:16:14 2014 +1100
|
--- a/include/carve/win32.h Wed Jan 15 13:16:14 2014 +1100
|
||||||
+++ b/include/carve/win32.h Tue Jan 28 01:35:54 2014 +0600
|
+++ b/include/carve/win32.h Fri Jan 31 15:32:01 2014 +0600
|
||||||
@@ -32,14 +32,22 @@
|
@@ -32,17 +32,27 @@
|
||||||
|
|
||||||
# if _MSC_VER < 1600
|
# if _MSC_VER < 1600
|
||||||
// stdint.h is not available before VS2010
|
// stdint.h is not available before VS2010
|
||||||
@ -23,10 +23,15 @@ diff -r e82d852e4fb0 include/carve/win32.h
|
|||||||
+typedef unsigned __int8 uint8_t;
|
+typedef unsigned __int8 uint8_t;
|
||||||
+typedef unsigned __int16 uint16_t;
|
+typedef unsigned __int16 uint16_t;
|
||||||
+typedef unsigned __int32 uint32_t;
|
+typedef unsigned __int32 uint32_t;
|
||||||
+
|
|
||||||
+# include <BaseTsd.h>
|
|
||||||
+typedef SSIZE_T ssize_t;
|
|
||||||
+#endif
|
+#endif
|
||||||
typedef __int64 int64_t;
|
typedef __int64 int64_t;
|
||||||
typedef unsigned __int64 uint64_t;
|
typedef unsigned __int64 uint64_t;
|
||||||
# else
|
# else
|
||||||
|
# include <stdint.h>
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+#if defined(_MSC_VER)
|
||||||
|
+# include <BaseTsd.h>
|
||||||
|
+typedef SSIZE_T ssize_t;
|
||||||
|
+#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user