X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qtypes.h;h=7c525a69c234b731324103548da6f30116e836cb;hb=5988fa1d88c960a98cb41f5fef05de27242f5bb7;hp=480b1e7fd6a4583e81e0065049b578dc10775cc8;hpb=a2445d85eccf4d0c5766f44f02cd04a600c4bad4;p=xonotic%2Fdarkplaces.git

diff --git a/qtypes.h b/qtypes.h
index 480b1e7f..7c525a69 100644
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,14 +2,16 @@
 #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
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WIN64)
 # define ssize_t long
 #endif
 
@@ -18,8 +20,8 @@ typedef enum {false, true} qboolean;
 #endif
 
 #ifndef FALSE
-#define FALSE 0
-#define TRUE 1
+#define FALSE false
+#define TRUE true
 #endif
 
 // up / down