Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-10-09 23:49:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-10-09 23:49:09 +0400
commitccd2e4375a3a8d1338d15d00193ff56da63809c3 (patch)
treeac7f83b460a6e11cfce59918f801a8903510da0f /extern/libmv/third_party
parent9aeced47114793112f0228ae216926d6f689280c (diff)
Fix compilation error after recent libmv change
- Tweaked typedefs in stdint so they match what we've got in BLI_sys_types (needed to explicitly tell sign to MSVC). Not so much harmful to be more explicit here, but we really better to have single stdint int blender. - Tweaked allocations macros so MSVC is happy with structures allocation.
Diffstat (limited to 'extern/libmv/third_party')
-rw-r--r--extern/libmv/third_party/msinttypes/stdint.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/extern/libmv/third_party/msinttypes/stdint.h b/extern/libmv/third_party/msinttypes/stdint.h
index e236bb00015..189ee34571c 100644
--- a/extern/libmv/third_party/msinttypes/stdint.h
+++ b/extern/libmv/third_party/msinttypes/stdint.h
@@ -72,16 +72,16 @@ extern "C" {
// realize that, e.g. char has the same size as __int8
// so we give up on __intX for them.
#if (_MSC_VER < 1300)
- typedef char int8_t;
- typedef short int16_t;
- typedef int int32_t;
+ typedef signed char int8_t;
+ typedef signed short int16_t;
+ typedef signed int int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
#else
- typedef __int8 int8_t;
- typedef __int16 int16_t;
- typedef __int32 int32_t;
+ typedef signed __int8 int8_t;
+ typedef signed __int16 int16_t;
+ typedef signed __int32 int32_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;