Merge branch 'nomagicpath' into 'master'

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

diff --git a/libs/picomodel/picointernal.c b/libs/picomodel/picointernal.c
index e5e9238bf152b033bd3002ed155a1feb19c05421..018ee3a130295869d9294409545e6ca6a7792cb6 100644 (file)
--- a/libs/picomodel/picointernal.c
+++ b/libs/picomodel/picointernal.c
@@ -39,6 +39,7 @@
 /* dependencies */
 #include <string.h>
 #include "picointernal.h"
+#include "globaldefs.h"
 
 
 
@@ -476,7 +477,7 @@ void _pico_copy_color( picoColor_t src, picoColor_t dest ){
        dest[ 3 ] = src[ 3 ];
 }
 
-#ifdef __BIG_ENDIAN__
+#if GDEF_ARCH_ENDIAN_BIG
 
 int   _pico_big_long( int src ) { return src; }
 short _pico_big_short( short src ) { return src; }
@@ -756,7 +757,7 @@ picoParser_t *_pico_new_parser( const picoByte_t *buffer, int bufSize ){
        }
        /* setup */
        p->buffer   = (const char *) buffer;
-       p->cursor   = (const char *) buffer;
+       p->cursor   = p->buffer;
        p->bufSize  = bufSize;
        p->max      = p->buffer + bufSize;
        p->curLine = 1; /* sea: new */