[Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.45,1.46
Max Horn
fingolfin at users.sourceforge.net
Sat Mar 6 19:52:02 CET 2004
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10831
Modified Files:
scummsys.h
Log Message:
remove dependency on SDL_byteorder.h when we are using config.h
Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- scummsys.h 28 Feb 2004 12:57:52 -0000 1.45
+++ scummsys.h 7 Mar 2004 03:28:01 -0000 1.46
@@ -106,22 +106,24 @@
#define CHECK_HEAP
- #ifdef X11_BACKEND
-
- // You need to set this manually if necessary
-// #define SCUMM_LITTLE_ENDIAN
+ #ifndef CONFIG_H
+ #ifdef X11_BACKEND
- #else
- /* need this for the SDL_BYTEORDER define */
- #include <SDL_byteorder.h>
-
- #if SDL_BYTEORDER == SDL_LIL_ENDIAN
- #define SCUMM_LITTLE_ENDIAN
- #elif SDL_BYTEORDER == SDL_BIG_ENDIAN
- #define SCUMM_BIG_ENDIAN
- #else
- #error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set.
- #endif
+ // You need to set this manually if necessary
+ // #define SCUMM_LITTLE_ENDIAN
+
+ #else
+ /* need this for the SDL_BYTEORDER define */
+ #include <SDL_byteorder.h>
+
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
+ #define SCUMM_LITTLE_ENDIAN
+ #elif SDL_BYTEORDER == SDL_BIG_ENDIAN
+ #define SCUMM_BIG_ENDIAN
+ #else
+ #error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set.
+ #endif
+ #endif
#endif
// You need to set this manually if necessary
More information about the Scummvm-git-logs
mailing list