From 3e7eed35ba0e63f93fbe45d7bb14abb0c1ff956f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 6 Nov 2010 06:29:09 +0100 Subject: Fix khronos typedefs - KD: use sys include - KD: use KHR/khrplatform.h - KHR/khrplatform.h: Use stddef.h ptrdiff_t and size_t if possible (fix) --- make/stub_includes/khr/KD/kd.h | 2 +- make/stub_includes/khr/KD/kdplatform.h | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'make/stub_includes/khr/KD') diff --git a/make/stub_includes/khr/KD/kd.h b/make/stub_includes/khr/KD/kd.h index e2353eeb6..a87589aba 100644 --- a/make/stub_includes/khr/KD/kd.h +++ b/make/stub_includes/khr/KD/kd.h @@ -6,7 +6,7 @@ extern "C" { #endif -#include "kdplatform.h" +#include diff --git a/make/stub_includes/khr/KD/kdplatform.h b/make/stub_includes/khr/KD/kdplatform.h index 0357b1e2e..ff932fbb5 100644 --- a/make/stub_includes/khr/KD/kdplatform.h +++ b/make/stub_includes/khr/KD/kdplatform.h @@ -2,23 +2,20 @@ #ifndef __kdplatform_h_ #define __kdplatform_h_ +#include + #define KD_API #define KD_APIENTRY -typedef int KDint32; -typedef unsigned int KDuint32; -#if defined(_MSC_VER) -typedef signed __int64 KDint64; -typedef unsigned __int64 KDuint64; -#else -typedef long long KDint64; -typedef unsigned long long KDuint64; -#endif -typedef short KDint16; -typedef unsigned short KDuint16; -typedef unsigned long KDuintptr; -typedef unsigned long KDsize; -typedef long KDssize; +typedef khronos_int32_t KDint32; +typedef khronos_uint32_t KDuint32; +typedef khronos_int64_t KDint64; +typedef khronos_uint64_t KDuint64; +typedef khronos_int16_t KDint16; +typedef khronos_uint16_t KDuint16; +typedef khronos_uintptr_t KDuintptr; +typedef khronos_usize_t KDsize; +typedef khronos_ssize_t KDssize; #define KDINT_MIN (-0x7fffffff-1) #define KDINT_MAX 0x7fffffff #define KDUINT_MAX 0xffffffffU -- cgit v1.2.3