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/include/carve/win32.h | |
| parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
| parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) | |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'extern/carve/include/carve/win32.h')
| -rwxr-xr-x | extern/carve/include/carve/win32.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/extern/carve/include/carve/win32.h b/extern/carve/include/carve/win32.h index 81b2ea4d6fa..78a101e6f98 100755 --- a/extern/carve/include/carve/win32.h +++ b/extern/carve/include/carve/win32.h @@ -8,11 +8,9 @@ #include <string.h> #include <stdlib.h> -#if !defined(__MINGW32__) inline int strcasecmp(const char *a, const char *b) { return _stricmp(a,b); } -#endif inline void srandom(unsigned long input) { srand(input); @@ -34,7 +32,7 @@ typedef unsigned long uintptr_t; # if _MSC_VER < 1600 // stdint.h is not available before VS2010 -#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 */ |