Merge commit 'bf6dd1f2d186c799adf11f1e744a1ff57aa8d335' into garux-merge

[xonotic/netradiant.git] / libs / picomodel / picointernal.h

diff --git a/libs/picomodel/picointernal.h b/libs/picomodel/picointernal.h
index 07c24cb570c39b2a5b2d102ee253f4addf158a2c..4bcbd4c281ae026efd4ad87ea7375f17ee4adb45 100644 (file)
--- a/libs/picomodel/picointernal.h
+++ b/libs/picomodel/picointernal.h
@@ -38,6 +38,8 @@
 #ifndef PICOINTERNAL_H
 #define PICOINTERNAL_H
 
+#include "globaldefs.h"
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -56,7 +58,7 @@ extern "C"
 
 
 /* os dependent replacements */
-#if WIN32 || _WIN32
+#if GDEF_OS_WINDOWS
        #define _pico_stricmp stricmp
        #define _pico_strnicmp strnicmp
 #else
@@ -78,22 +80,22 @@ extern "C"
 /* types */
 typedef struct picoParser_s
 {
-       const char  *buffer;
+       const char *buffer;
        int bufSize;
-       char    *token;
+       char *token;
        int tokenSize;
        int tokenMax;
-       const char  *cursor;
-       const char  *max;
+       const char *cursor;
+       const char *max;
        int curLine;
 }
 picoParser_t;
 
 typedef struct picoMemStream_s
 {
-       const picoByte_t    *buffer;
+       const picoByte_t *buffer;
        int bufSize;
-       const picoByte_t    *curPos;
+       const picoByte_t *curPos;
        int flag;
 }
 picoMemStream_t;