added mod_collision_bih_childrengrouping cvar (default 16), this

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 24ab64b4a6a23f90aadea273d098efb4613da46c..250beaee080cdba1a12751aa639cf6be03f00cfc 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,17 +2,13 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-typedef unsigned char qbyte;
-
 #undef true
 #undef false
 
-typedef enum {false, true} qboolean;
-
-#ifdef WIN64
-# define ssize_t long long
-#elifdef WIN32
-# define ssize_t long
+#ifndef __cplusplus
+typedef enum qboolean_e {false, true} qboolean;
+#else
+typedef bool qboolean;
 #endif
 
 #ifndef NULL
@@ -20,8 +16,8 @@ typedef enum {false, true} qboolean;
 #endif
 
 #ifndef FALSE
-#define FALSE 0
-#define TRUE 1
+#define FALSE false
+#define TRUE true
 #endif
 
 // up / down
@@ -33,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