Merge commit 'f93b3f61846b91a5679daca40a5f23e355ac787b' into garux-merge

[xonotic/netradiant.git] / tools / quake3 / common / trilib.c

diff --git a/tools/quake3/common/trilib.c b/tools/quake3/common/trilib.c
index 677147683df5b89baa398f598a03d86c6c835935..5f403418ff449077f8c7a2f1a83d5451ac0b4278 100644 (file)
--- a/tools/quake3/common/trilib.c
+++ b/tools/quake3/common/trilib.c
@@ -23,6 +23,7 @@
 // trilib.c: library for loading triangles from an Alias triangle file
 //
 
+#include "globaldefs.h"
 #include <stdio.h>
 #include "cmdlib.h"
 #include "mathlib.h"
@@ -38,7 +39,7 @@
 
 //#define NOISY 1
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if GDEF_OS_LINUX || GDEF_OS_MACOS
 #define strlwr strlower
 #endif
 
@@ -61,7 +62,7 @@ typedef struct {
 
 
 static void ByteSwapTri( tf_triangle *tri ){
-       int i;
+       unsigned int i;
 
        for ( i = 0 ; i < sizeof( tf_triangle ) / 4 ; i++ )
        {