X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qtypes.h;h=7c525a69c234b731324103548da6f30116e836cb;hb=971ad66cc21064832305abca4e356213dd513d9b;hp=5e1d5750e75d98aeb52fcae922342f1541d0d7a1;hpb=2e7e9acfa38289a2128b466db0561e2caa573ef8;p=xonotic%2Fdarkplaces.git diff --git a/qtypes.h b/qtypes.h index 5e1d5750..7c525a69 100644 --- 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