diff --git a/include/datatypes.h b/include/datatypes.h index 3b802e6..d022f07 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -1,7 +1,7 @@ #ifndef __datatypes_h__ #define __datatypes_h__ -#ifdef WIN32 +#ifdef WIN32 //Make this MSVC something typedef unsigned __int8 uint8; typedef unsigned __int16 uint16; typedef unsigned __int32 uint32; @@ -28,7 +28,7 @@ typedef qword dq; */ #endif -#ifdef __linux +#ifdef __GNUC__ //ie if we are using GCC //used to be __linux typedef unsigned char uint8; typedef unsigned short uint16; typedef unsigned long uint32; diff --git a/include/myglFont.h b/include/myglFont.h index eaee119..c19cec2 100644 --- a/include/myglFont.h +++ b/include/myglFont.h @@ -11,7 +11,7 @@ namespace OpenArena short screenWidth; short screenHeight; unsigned int base; - unsigned int texture; + GLuint texture; bool status; public: