[Bf-blender-cvs] [efaadc3] master: Attempt to fix compilation error with MSVC-2008

Sergey Sharybin noreply at git.blender.org
Mon Jan 27 20:37:51 CET 2014


Commit: efaadc3104ce1374d07a679af2ee099ece512f26
Author: Sergey Sharybin
Date:   Tue Jan 28 01:36:49 2014 +0600
https://developer.blender.org/rBefaadc3104ce1374d07a679af2ee099ece512f26

Attempt to fix compilation error with MSVC-2008

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

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
index 5f8ce3b..0cb2627 100755
--- a/extern/carve/include/carve/win32.h
+++ b/extern/carve/include/carve/win32.h
@@ -46,6 +46,9 @@ 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;
diff --git a/extern/carve/patches/win32.patch b/extern/carve/patches/win32.patch
index e0834ef..7266b0b 100644
--- a/extern/carve/patches/win32.patch
+++ b/extern/carve/patches/win32.patch
@@ -1,7 +1,7 @@
-diff -r 47dfdaff1dd5 include/carve/win32.h
---- a/include/carve/win32.h	Thu Jan 12 15:49:04 2012 -0500
-+++ b/include/carve/win32.h	Fri Jan 13 03:15:51 2012 +0600
-@@ -32,14 +32,19 @@
+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 @@
  
  #  if _MSC_VER < 1600
  // stdint.h is not available before VS2010
@@ -23,6 +23,9 @@ diff -r 47dfdaff1dd5 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;




More information about the Bf-blender-cvs mailing list