eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 5e1d5750e75d98aeb52fcae922342f1541d0d7a1..7c525a69c234b731324103548da6f30116e836cb 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,27 +2,26 @@
 #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
+
+#if defined(WIN32) && !defined(WIN64)
+# define ssize_t long
+#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