diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-27 23:36:49 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-27 23:37:41 +0400 |
| commit | efaadc3104ce1374d07a679af2ee099ece512f26 (patch) | |
| tree | 8fc1607d27636602c4e1886cb68981229953c304 /extern/carve | |
| parent | e983ed6aaa4d32326163ffc281d7ad4ade617674 (diff) | |
Attempt to fix compilation error with MSVC-2008
Diffstat (limited to 'extern/carve')
| -rwxr-xr-x | extern/carve/include/carve/win32.h | 3 | ||||
| -rw-r--r-- | extern/carve/patches/win32.patch | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/extern/carve/include/carve/win32.h b/extern/carve/include/carve/win32.h index 5f8ce3b3bf6..0cb26273153 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 e0834ef1ce1..7266b0b7acb 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; |