diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
| commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
| tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /extern/carve/patches/win32.patch | |
| parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
| parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) | |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'extern/carve/patches/win32.patch')
| -rw-r--r-- | extern/carve/patches/win32.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/carve/patches/win32.patch b/extern/carve/patches/win32.patch index 680bceb2421..1a5f9650532 100644 --- a/extern/carve/patches/win32.patch +++ b/extern/carve/patches/win32.patch @@ -8,7 +8,7 @@ diff -r e82d852e4fb0 include/carve/win32.h -typedef char int8_t; -typedef short int16_t; -typedef long int32_t; -+#if defined(_WIN32) && !defined(__MINGW32__) ++#if defined(_WIN32) +/* The __intXX are built-in types of the visual complier! So we don't + need to include anything else here. + This typedefs should be in sync with types from MEM_sys_types.h */ |