X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=qtypes.h;h=7e10a4fa4310e5d7acd49ca3ea4243aa8b3f9847;hp=f6ce845d633a82910e0d9aa8384d2e0f4ddbc855;hb=286d88693703cfef2443052a4612687e7125dd02;hpb=0ad63a18c8d59dc27c0729175d6d0fea3cdd4d18

diff --git a/qtypes.h b/qtypes.h
index f6ce845d..7e10a4fa 100644
--- a/qtypes.h
+++ b/qtypes.h
@@ -4,8 +4,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <inttypes.h>
 
-typedef bool qboolean;
+typedef bool qbool;
 
 #ifndef NULL
 #define NULL ((void *)0)
@@ -20,26 +21,40 @@ typedef bool qboolean;
 // fall over
 #define	ROLL	2
 
-#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#if defined(__GNUC__) || (__clang__) || (__TINYC__) || (_MSC_VER >= 1400)
 #define RESTRICT __restrict
 #else
 #define RESTRICT
 #endif
 
-typedef long long dpint64;
-typedef unsigned long long dpuint64;
+typedef int8_t i8;
+typedef int16_t i16;
+typedef int32_t i32;
+typedef int64_t i64;
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef intptr_t iptr;
+typedef uintptr_t uptr;
 
 // LadyHavoc: upgrade the prvm to double precision for better time values
 // LadyHavoc: to be enabled when bugs are worked out...
-#define PRVM_64
+//#define PRVM_64
 #ifdef PRVM_64
 typedef double prvm_vec_t;
-typedef long long prvm_int_t;
-typedef unsigned long long prvm_uint_t;
+typedef int64_t prvm_int_t;
+typedef uint64_t prvm_uint_t;
+#define PRVM_PRIi PRIi64
+#define PRVM_PRIu PRIu64
 #else
 typedef float prvm_vec_t;
-typedef int prvm_int_t;
-typedef unsigned int prvm_uint_t;
+typedef int32_t prvm_int_t;
+typedef uint32_t prvm_uint_t;
+#define PRVM_PRIi PRIi32
+#define PRVM_PRIu PRIu32
 #endif
 typedef prvm_vec_t prvm_vec3_t[3];
 
@@ -51,9 +66,4 @@ typedef float vec_t;
 typedef vec_t vec2_t[2];
 typedef vec_t vec3_t[3];
 typedef vec_t vec4_t[4];
-typedef vec_t vec5_t[5];
-typedef vec_t vec6_t[6];
-typedef vec_t vec7_t[7];
-typedef vec_t vec8_t[8];
-
 #endif