X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qtypes.h;h=250beaee080cdba1a12751aa639cf6be03f00cfc;hb=731676e9941abc46e66d54f84c7e3d65c7ef3f40;hp=5e1d5750e75d98aeb52fcae922342f1541d0d7a1;hpb=2e7e9acfa38289a2128b466db0561e2caa573ef8;p=xonotic%2Fdarkplaces.git

diff --git a/qtypes.h b/qtypes.h
index 5e1d5750..250beaee 100644
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,27 +2,22 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-typedef unsigned char qbyte;
-
 #undef true
 #undef false
 
-typedef enum {false, true} qboolean;
+#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 0
-#define TRUE 1
-#endif
-
-//define	PARANOID			// speed sapping error checking
-#ifdef _DEBUG
-#define ASSERT(condition) if (!(condition)) Sys_Error("assertion (##condition) failed at " __FILE__ ":" __LINE__ "\n");
-#else
-#define ASSERT(condition)
+#define FALSE false
+#define TRUE true
 #endif
 
 // up / down
@@ -34,4 +29,10 @@ typedef enum {false, true} qboolean;
 // fall over
 #define	ROLL	2
 
+#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#define RESTRICT __restrict
+#else
+#define RESTRICT
+#endif
+
 #endif