X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qtypes.h;h=250beaee080cdba1a12751aa639cf6be03f00cfc;hb=8b0fbc64175362acf3ea872029a423012b76a4f8;hp=480b1e7fd6a4583e81e0065049b578dc10775cc8;hpb=a2445d85eccf4d0c5766f44f02cd04a600c4bad4;p=xonotic%2Fdarkplaces.git

diff --git a/qtypes.h b/qtypes.h
index 480b1e7f..250beaee 100644
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,15 +2,13 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-typedef unsigned char qbyte;
-
 #undef true
 #undef false
 
-typedef enum {false, true} qboolean;
-
-#ifdef WIN32
-# define ssize_t long
+#ifndef __cplusplus
+typedef enum qboolean_e {false, true} qboolean;
+#else
+typedef bool qboolean;
 #endif
 
 #ifndef NULL
@@ -18,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
@@ -31,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