Rename q3shaderinfo_t to shader_t, to be in line with other engines

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 57c8b5891e848c93468488a9b3a51a7882c13ebf..e385e286a7dffc73d8541b0e040f78dd683ae75d 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,24 +2,16 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-#undef true
-#undef false
+#include <stdint.h>
+#include <stdbool.h>
+#include <inttypes.h>
 
-#ifndef __cplusplus
-typedef enum qboolean_e {false, true} qboolean;
-#else
 typedef bool qboolean;
-#endif
 
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
 
-#ifndef FALSE
-#define FALSE false
-#define TRUE true
-#endif
-
 // up / down
 #define        PITCH   0
 
@@ -35,15 +27,21 @@ typedef bool qboolean;
 #define RESTRICT
 #endif
 
-// LordHavoc: upgrade the prvm to double precision for better time values
-// LordHavoc: to be enabled when bugs are worked out...
+// LadyHavoc: upgrade the prvm to double precision for better time values
+// LadyHavoc: to be enabled when bugs are worked out...
 //#define PRVM_64
 #ifdef PRVM_64
 typedef double prvm_vec_t;
-typedef long long prvm_int_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 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];