@@ -153,20 +153,6 @@ typedef int64_t khronos_int64_t;
153153typedef uint64_t khronos_uint64_t ;
154154#define KHRONOS_SUPPORT_INT64 1
155155#define KHRONOS_SUPPORT_FLOAT 1
156- /*
157- * To support platform where unsigned long cannot be used interchangeably with
158- * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
159- * Ideally, we could just use (u)intptr_t everywhere, but this could result in
160- * ABI breakage if khronos_uintptr_t is changed from unsigned long to
161- * unsigned long long or similar (this results in different C++ name mangling).
162- * To avoid changes for existing platforms, we restrict usage of intptr_t to
163- * platforms where the size of a pointer is larger than the size of long.
164- */
165- #if defined(__SIZEOF_LONG__ ) && defined(__SIZEOF_POINTER__ )
166- #if __SIZEOF_POINTER__ > __SIZEOF_LONG__
167- #define KHRONOS_USE_INTPTR_T
168- #endif
169- #endif
170156
171157#elif defined(__VMS ) || defined(__sgi )
172158
@@ -249,21 +235,14 @@ typedef unsigned short int khronos_uint16_t;
249235 * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
250236 * to be the only LLP64 architecture in current use.
251237 */
252- #ifdef KHRONOS_USE_INTPTR_T
253- typedef intptr_t khronos_intptr_t ;
254- typedef uintptr_t khronos_uintptr_t ;
255- #elif defined(_WIN64 )
238+ #ifdef _WIN64
256239typedef signed long long int khronos_intptr_t ;
257240typedef unsigned long long int khronos_uintptr_t ;
258- #else
259- typedef signed long int khronos_intptr_t ;
260- typedef unsigned long int khronos_uintptr_t ;
261- #endif
262-
263- #if defined(_WIN64 )
264241typedef signed long long int khronos_ssize_t ;
265242typedef unsigned long long int khronos_usize_t ;
266243#else
244+ typedef signed long int khronos_intptr_t ;
245+ typedef unsigned long int khronos_uintptr_t ;
267246typedef signed long int khronos_ssize_t ;
268247typedef unsigned long int khronos_usize_t ;
269248#endif
0 commit comments