diff options
Diffstat (limited to 'make/stub_includes')
-rw-r--r-- | make/stub_includes/gluegen/gluegen_types.h | 44 | ||||
-rw-r--r-- | make/stub_includes/gluegen/inttypes.h | 7 | ||||
-rw-r--r-- | make/stub_includes/gluegen/stdarg.h | 7 | ||||
-rw-r--r-- | make/stub_includes/gluegen/stddef.h | 6 | ||||
-rw-r--r-- | make/stub_includes/gluegen/stdint.h | 7 | ||||
-rw-r--r-- | make/stub_includes/khr/KHR/khrplatform.h | 104 |
6 files changed, 8 insertions, 167 deletions
diff --git a/make/stub_includes/gluegen/gluegen_types.h b/make/stub_includes/gluegen/gluegen_types.h deleted file mode 100644 index c854d3345..000000000 --- a/make/stub_includes/gluegen/gluegen_types.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef __gluegen_types_h -#define __gluegen_types_h - -/** - * These are standard include replacement files - * for gluegen processing only! - * - * Don't include this folder to your native compiler! - * - * Purpose of all files within this folder is to define a fixed bitsize - * across all platforms to allow the resulting java type comfort all. - * IE a 'intptr_t' shall always be 64bit. - * - * We use one size fits all. - */ -#if defined(__STDC_VERSION__) || defined(__GNUC__) || defined (__ARMCC_2__) || \ - defined(__VMS) || defined(__sgi) || defined(__sun__) || defined(__digital__) || defined(__unix__) || defined(__SCO__) || defined(OPENSTEP) || \ - defined(BSD) || defined(FREEBSD) || defined(_HPUX) || defined(SOLARIS) || defined(macosx) || \ - defined(_WIN32) || defined(_WIN32_WCE) || defined(WINVER) || defined(_WIN32_WINNT) || defined(__CYGWIN__) || \ - defined(__SCITECH_SNAP__) || defined (__SYMBIAN32__) || \ - defined(__arch64__) || defined(_LP64) - - #error PLATFORM or COMPILER DEFINES FOUND, not allowed within GLUEGEN HEADER - -#endif - -/** - * Look in the GlueGen.java API documentation for the build-in types (terminal symbols) - * definition. - * - * The following types are build-in: - * - * __int32 - * int32_t - * uint32_t - * __int64 - * int64_t - * uint64_t - * ptrdiff_t - * size_t - */ - -#endif /* __gluegen_types_h */ - diff --git a/make/stub_includes/gluegen/inttypes.h b/make/stub_includes/gluegen/inttypes.h deleted file mode 100644 index b4ac3d40f..000000000 --- a/make/stub_includes/gluegen/inttypes.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __inttypes_h -#define __inttypes_h - -#include <gluegen_types.h> - -#endif /* __stdint_h */ - diff --git a/make/stub_includes/gluegen/stdarg.h b/make/stub_includes/gluegen/stdarg.h deleted file mode 100644 index b5b585baa..000000000 --- a/make/stub_includes/gluegen/stdarg.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __stdarg_h -#define __stdarg_h - -#include <gluegen_types.h> - -#endif /* __stdarg_h */ - diff --git a/make/stub_includes/gluegen/stddef.h b/make/stub_includes/gluegen/stddef.h deleted file mode 100644 index a3890b08a..000000000 --- a/make/stub_includes/gluegen/stddef.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __stddef_h -#define __stddef_h - -#include <gluegen_types.h> - -#endif /* __stddef_h */ diff --git a/make/stub_includes/gluegen/stdint.h b/make/stub_includes/gluegen/stdint.h deleted file mode 100644 index dd03d2d1e..000000000 --- a/make/stub_includes/gluegen/stdint.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __stdint_h -#define __stdint_h - -#include <gluegen_types.h> - -#endif /* __stdint_h */ - diff --git a/make/stub_includes/khr/KHR/khrplatform.h b/make/stub_includes/khr/KHR/khrplatform.h index 1c578feb8..1f10e5c0a 100644 --- a/make/stub_includes/khr/KHR/khrplatform.h +++ b/make/stub_includes/khr/KHR/khrplatform.h @@ -132,16 +132,14 @@ /*------------------------------------------------------------------------- * basic type definitions *-----------------------------------------------------------------------*/ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) - /* - * Using <stddef.h> - * Using <stdint.h> + * Using <gluegen_stddef.h> + * Using <gluegen_stdint.h> */ -#include <stddef.h> +#include <gluegen_stddef.h> #define HAS_STDDEF 1 -#include <stdint.h> +#include <gluegen_stdint.h> typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; typedef int64_t khronos_int64_t; @@ -149,100 +147,14 @@ typedef uint64_t khronos_uint64_t; #define KHRONOS_SUPPORT_INT64 1 #define KHRONOS_SUPPORT_FLOAT 1 -#elif defined(__VMS ) || defined(__sgi) - -/* - * Using <stddef.h> - * Using <inttypes.h> - */ -#include <stddef.h> -#define HAS_STDDEF 1 -#include <inttypes.h> -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(_WIN32) && !defined(__SCITECH_SNAP__) - -/* - * Win32 - */ -typedef __int32 khronos_int32_t; -typedef unsigned __int32 khronos_uint32_t; -typedef __int64 khronos_int64_t; -typedef unsigned __int64 khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__sun__) || defined(__digital__) - -/* - * Sun or Digital - */ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#if defined(__arch64__) || defined(_LP64) -typedef long int khronos_int64_t; -typedef unsigned long int khronos_uint64_t; -#else -typedef long long int khronos_int64_t; -typedef unsigned long long int khronos_uint64_t; -#endif /* __arch64__ */ -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif 0 - -/* - * Hypothetical platform with no float or int64 support - */ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#define KHRONOS_SUPPORT_INT64 0 -#define KHRONOS_SUPPORT_FLOAT 0 - -#else - -/* - * Generic fallback - * - * Using <stddef.h> - * Using <stdint.h> - */ -#include <stddef.h> -#define HAS_STDDEF 1 -#include <stdint.h> -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#endif - - -/* - * Types that are (so far) the same on all platforms - */ 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; -#ifndef HAS_STDDEF - 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; -#else - typedef ptrdiff_t khronos_intptr_t; - typedef size_t khronos_uintptr_t; - typedef ptrdiff_t khronos_ssize_t; - typedef size_t khronos_usize_t; -#endif +typedef ptrdiff_t khronos_intptr_t; +typedef size_t khronos_uintptr_t; +typedef ptrdiff_t khronos_ssize_t; +typedef size_t khronos_usize_t; #if KHRONOS_SUPPORT_FLOAT /* |