renamed byte to qbyte throughout engine to eliminate a mingw conflict

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 85760abad582bb32b6c2029c71990b0c9bba651e..dbaf99cc4a82c37d1513a31ca2a1d54bb0612ad9 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -21,12 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define QUAKE_GAME // as opposed to utilities
 
+#include <math.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <setjmp.h>
+
 extern char *buildstring;
 
-#if !defined BYTE_DEFINED
-typedef unsigned char          byte;
-#define BYTE_DEFINED 1
-#endif
+typedef unsigned char qbyte;
 
 #undef true
 #undef false
@@ -51,13 +55,6 @@ typedef enum {false, true} qboolean;
 
 #define GAMENAME "id1"
 
-#include <math.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <setjmp.h>
-
 #define MAX_NUM_ARGVS  50
 
 // up / down
@@ -294,7 +291,7 @@ void Chase_Reset (void);
 void Chase_Update (void);
 
 void fractalnoise(unsigned char *noise, int size, int startgrid);
-void fractalnoisequick(byte *noise, int size, int startgrid);
+void fractalnoisequick(unsigned char *noise, int size, int startgrid);
 
 #include "palette.h"
 #include "image.h"