Clean up qtypes.h. Use stdbool.h on non-MSVC. Replace allcaps with lowercase

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index f391a40af120ecfb27fc316759bded543c84fc85..d4fa148e189051342d9be25038f0494da16f6090 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,24 +2,20 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-#undef true
-#undef false
-
 #ifndef __cplusplus
-typedef enum qboolean_e {false, true} qboolean;
+#ifdef _MSC_VER
+typedef enum {false, true} bool;
 #else
-typedef bool qboolean;
+#include <stdbool.h>
 #endif
+#endif
+typedef bool qboolean;
+
 
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
 
-#ifndef FALSE
-#define FALSE false
-#define TRUE true
-#endif
-
 // up / down
 #define        PITCH   0