From 487406d861eef805aa72039141f36853177f8d1e Mon Sep 17 00:00:00 2001 From: dhewg Date: Fri, 16 Dec 2011 23:15:09 +0100 Subject: [PATCH] Move idlib typedefs to platform.h --- idlib/Lib.h | 23 ----------------------- sys/platform.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/idlib/Lib.h b/idlib/Lib.h index 0a013c7..44607f4 100644 --- a/idlib/Lib.h +++ b/idlib/Lib.h @@ -72,33 +72,10 @@ public: =============================================================================== */ -typedef unsigned char byte; // 8 bits -typedef unsigned short word; // 16 bits -typedef unsigned int dword; // 32 bits -typedef unsigned int uint; -typedef unsigned long ulong; - -typedef int qhandle_t; - class idFile; class idVec3; class idVec4; -#ifndef NULL -#define NULL ((void *)0) -#endif - -#ifndef BIT -#define BIT( num ) ( 1 << ( num ) ) -#endif - -#define MAX_STRING_CHARS 1024 // max length of a string - -// maximum world size -#define MAX_WORLD_COORD ( 128 * 1024 ) -#define MIN_WORLD_COORD ( -128 * 1024 ) -#define MAX_WORLD_SIZE ( MAX_WORLD_COORD - MIN_WORLD_COORD ) - // basic colors extern idVec4 colorBlack; extern idVec4 colorWhite; diff --git a/sys/platform.h b/sys/platform.h index f062829..77fab55 100644 --- a/sys/platform.h +++ b/sys/platform.h @@ -216,4 +216,27 @@ If you have questions concerning this license or the applicable additional terms #define ID_TIME_T time_t +typedef unsigned char byte; // 8 bits +typedef unsigned short word; // 16 bits +typedef unsigned int dword; // 32 bits +typedef unsigned int uint; +typedef unsigned long ulong; + +typedef int qhandle_t; + +#ifndef NULL +#define NULL ((void *)0) +#endif + +#ifndef BIT +#define BIT( num ) ( 1 << ( num ) ) +#endif + +#define MAX_STRING_CHARS 1024 // max length of a string + +// maximum world size +#define MAX_WORLD_COORD ( 128 * 1024 ) +#define MIN_WORLD_COORD ( -128 * 1024 ) +#define MAX_WORLD_SIZE ( MAX_WORLD_COORD - MIN_WORLD_COORD ) + #endif