diff options
| author | Shannon Woods <shannonwoods@chromium.org> | 2013-10-04 11:04:55 -0400 |
|---|---|---|
| committer | Shannon Woods <shannonwoods@chromium.org> | 2013-10-04 11:12:49 -0400 |
| commit | 93780289a7c383cbff7c22d5cdb4f885afcc5867 (patch) | |
| tree | 901854cbda4dc28fb8aed9e3a6c3ebfe109af0e6 /include | |
| parent | ef2c2b83ce2e001edce1b34848d7828ca4ebcde4 (diff) | |
| download | angle-93780289a7c383cbff7c22d5cdb4f885afcc5867.tar.gz | |
Update to most recent khrplatform.h
Signed-off-by: Geoff Lang
Signed-off-by: Jamie Madill
Diffstat (limited to 'include')
| -rwxr-xr-x[-rw-r--r--] | include/KHR/khrplatform.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/KHR/khrplatform.h b/include/KHR/khrplatform.h index 8ec0d199..c9e6f17d 100644..100755 --- a/include/KHR/khrplatform.h +++ b/include/KHR/khrplatform.h @@ -26,7 +26,7 @@ /* Khronos platform-specific types and definitions. * - * $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $ + * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ * * Adopters may modify this file to suit their platform. Adopters are * encouraged to submit platform specific modifications to the Khronos @@ -221,10 +221,23 @@ typedef signed char khronos_int8_t; typedef unsigned char khronos_uint8_t; typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; + +/* + * Types that differ between LLP64 and LP64 architectures - in LLP64, + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears + * to be the only LLP64 architecture in current use. + */ +#ifdef _WIN64 +typedef signed long long int khronos_intptr_t; +typedef unsigned long long int khronos_uintptr_t; +typedef signed long long int khronos_ssize_t; +typedef unsigned long long int khronos_usize_t; +#else typedef signed long int khronos_intptr_t; typedef unsigned long int khronos_uintptr_t; typedef signed long int khronos_ssize_t; typedef unsigned long int khronos_usize_t; +#endif #if KHRONOS_SUPPORT_FLOAT /* |