diff options
| author | Sven Gothel <[email protected]> | 2011-06-10 21:57:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-06-10 21:57:49 +0200 |
| commit | 396ef5fe91704062c96a7355b241db20ec8007fb (patch) | |
| tree | 59226c0001c3839a554a03fb4dc08784040f2d30 | |
| parent | 5d2f5413ded6de3acf87c5799b98a6482041ba1a (diff) | |
gluegen stddef/stdint cc header: add missing intptr_t/uintptr_t, proper formating, proper _WIN64 case
| -rw-r--r-- | make/stub_includes/platform/gluegen_stddef.h | 13 | ||||
| -rw-r--r-- | make/stub_includes/platform/gluegen_stdint.h | 43 |
2 files changed, 39 insertions, 17 deletions
diff --git a/make/stub_includes/platform/gluegen_stddef.h b/make/stub_includes/platform/gluegen_stddef.h index acd9dbd..6272bd1 100644 --- a/make/stub_includes/platform/gluegen_stddef.h +++ b/make/stub_includes/platform/gluegen_stddef.h @@ -10,12 +10,17 @@ #elif defined(WIN32) && defined(__GNUC__) #include <stddef.h> #elif defined(_WIN64) - typedef __int64 ptrdiff_t; - typedef unsigned long int size_t; + typedef __int64 ptrdiff_t; + typedef unsigned __int64 size_t; +#elif defined(_WIN32) + typedef __int32 ptrdiff_t; + typedef unsigned __int32 size_t; #elif defined(__ia64__) || defined(__x86_64__) - typedef long int ptrdiff_t; + typedef long ptrdiff_t; + typedef unsigned long size_t; #else - typedef int ptrdiff_t; + typedef int ptrdiff_t; + typedef unsigned int size_t; #endif #ifndef NULL diff --git a/make/stub_includes/platform/gluegen_stdint.h b/make/stub_includes/platform/gluegen_stdint.h index aabbc86..1dd712b 100644 --- a/make/stub_includes/platform/gluegen_stdint.h +++ b/make/stub_includes/platform/gluegen_stdint.h @@ -9,21 +9,38 @@ #include <stdint.h> #elif defined(WIN32) && defined(__GNUC__) #include <stdint.h> +#elif defined(_WIN64) + typedef __int32 int32_t; + typedef unsigned __int32 uint32_t; + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; + + typedef __int64 intptr_t; + typedef unsigned __int64 uintptr_t; #elif defined(_WIN32) - typedef __int32 int32_t; - typedef unsigned __int32 uint32_t; - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; + typedef __int32 int32_t; + typedef unsigned __int32 uint32_t; + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; + + typedef __int32 intptr_t; + typedef unsigned __int32 uintptr_t; +#elif defined(__ia64__) || defined(__x86_64__) + typedef signed int int32_t; + typedef unsigned int uint32_t; + typedef signed long int64_t; + typedef unsigned long uint64_t; + + typedef long intptr_t; + typedef unsigned long uintptr_t; #else - typedef signed int int32_t; - typedef unsigned int uint32_t; - #if defined(__ia64__) || defined(__x86_64__) - typedef signed long int int64_t; - typedef unsigned long int uint64_t; - #else - typedef signed long long int int64_t; - typedef unsigned long long int uint64_t; - #endif + typedef signed int int32_t; + typedef unsigned int uint32_t; + typedef signed long long int64_t; + typedef unsigned long long uint64_t; + + typedef int intptr_t; + typedef unsigned int uintptr_t; #endif #endif /* __gluegen_stdint_h */ |