[Bf-blender-cvs] [9896508] master: Fix compilation error with msvc2012 and 2013 as well

[Sergey Sharybin]

Commit: 9896508e14d220fd86567a4dd4e596af66eace24
Author: Sergey Sharybin
Date:   Fri Jan 31 15:30:36 2014 +0600
https://developer.blender.org/rB9896508e14d220fd86567a4dd4e596af66eace24

Fix compilation error with msvc2012 and 2013 as well

===================================================================

M	extern/carve/include/carve/win32.h
M	extern/carve/patches/win32.patch

===================================================================

diff --git a/extern/carve/include/carve/win32.h b/extern/carve/include/carve/win32.h
old mode 100755
new mode 100644
index 4a135b9..81b2ea4
--- a/extern/carve/include/carve/win32.h
+++ b/extern/carve/include/carve/win32.h
@@ -46,9 +46,6 @@ typedef signed __int32 int32_t;
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
-
-#  include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
 #endif
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
@@ -56,3 +53,8 @@ typedef unsigned __int64 uint64_t;
 #    include <stdint.h>
 #  endif
 #endif
+
+#if defined(_MSC_VER)
+#  include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
diff --git a/extern/carve/patches/win32.patch b/extern/carve/patches/win32.patch
index 5d3a3a0..680bceb 100644
--- a/extern/carve/patches/win32.patch
+++ b/extern/carve/patches/win32.patch
@@ -1,7 +1,7 @@
 diff -r e82d852e4fb0 include/carve/win32.h
 --- 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
-@@ -32,14 +32,22 @@
++++ b/include/carve/win32.h	Fri Jan 31 15:32:01 2014 +0600
+@@ -32,17 +32,27 @@
  
  #  if _MSC_VER < 1600
  // 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 __int16 uint16_t;
 +typedef unsigned __int32 uint32_t;
-+
-+#  include <BaseTsd.h>
-+typedef SSIZE_T ssize_t;
 +#endif
  typedef __int64 int64_t;
  typedef unsigned __int64 uint64_t;
  #  else
+ #    include <stdint.h>
+ #  endif
+ #endif
++
++#if defined(_MSC_VER)
++#  include <BaseTsd.h>
++typedef SSIZE_T ssize_t;
++#endif