make sure the return value of R_PicmipForFlags can't get negative

[xonotic/darkplaces.git] / qtypes.h

diff --git a/qtypes.h b/qtypes.h
index 22ac69a68d28718ed9f5525b1f0d78db2db3b02c..250beaee080cdba1a12751aa639cf6be03f00cfc 100644 (file)
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,21 +2,15 @@
 #ifndef QTYPES_H
 #define QTYPES_H
 
-typedef unsigned char qbyte;
-
 #undef true
 #undef false
 
 #ifndef __cplusplus
-typedef enum {false, true} qboolean;
+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
@@ -35,4 +29,10 @@ typedef bool qboolean;
 // fall over
 #define        ROLL    2
 
+#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#define RESTRICT __restrict
+#else
+#define RESTRICT
+#endif
+
 #endif