[Scummvm-cvs-logs] CVS: scummvm scummsys.h,1.37,1.38
Max Horn
fingolfin at users.sourceforge.net
Wed Jul 17 16:32:03 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm util.cpp,NONE,1.1 util.h,NONE,1.1 Makefile.common,1.13,1.14 gfx.h,1.10,1.11 newgui.cpp,1.21,1.22 newgui.h,1.16,1.17 scumm.h,1.186,1.187 sdl.cpp,1.133,1.134 sys.cpp,1.17,1.18 system.h,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv7880
Modified Files:
scummsys.h
Log Message:
patch for compiling on Alpha. We probably should switch all our 'long's to 'int's
Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- scummsys.h 14 May 2002 23:32:34 -0000 1.37
+++ scummsys.h 17 Jul 2002 23:31:52 -0000 1.38
@@ -115,12 +115,26 @@
typedef unsigned char byte;
typedef unsigned char uint8;
typedef unsigned short uint16;
-typedef unsigned long uint32;
typedef unsigned int uint;
typedef signed char int8;
typedef signed short int16;
+
+# if defined(__DECCXX) // Assume alpha architecture
+
+# define INVERSE_MKID
+# define SCUMM_NEED_ALIGNMENT
+
+typedef unsigned int uint32;
+typedef signed int int32;
+
+# else
+
+typedef unsigned long uint32;
typedef signed long int32;
+# endif
+
+
#if defined(__GNUC__)
#define START_PACK_STRUCTS
#define END_PACK_STRUCTS
@@ -229,8 +243,18 @@
//#error Little endian processors that need alignment is not implemented
//#endif
-#define MKID(a) ((((a)>>24)&0xFF) | (((a)>>8)&0xFF00) | (((a)<<8)&0xFF0000) | (((a)<<24)&0xFF000000))
-#define MKID_BE(a) (a)
+
+#define PROTO_MKID(a) ((((a)>>24)&0xFF) | (((a)>>8)&0xFF00) | (((a)<<8)&0xFF0000) | (((a)<<24)&0xFF000000))
+#define PROTO_MKID_BE(a) (a & 0xffffffff)
+
+#if defined(INVERSE_MKID)
+# define MKID(a) PROTO_MKID_BE(a)
+# define MKID_BE(a) PROTO_MKID(a)
+#else
+# define MKID(a) PROTO_MKID(a)
+# define MKID_BE(a) PROTO_MKID_BE(a)
+#endif
+
#if defined(SCUMM_NEED_ALIGNMENT)
FORCEINLINE uint READ_LE_UINT16(void *ptr) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm util.cpp,NONE,1.1 util.h,NONE,1.1 Makefile.common,1.13,1.14 gfx.h,1.10,1.11 newgui.cpp,1.21,1.22 newgui.h,1.16,1.17 scumm.h,1.186,1.187 sdl.cpp,1.133,1.134 sys.cpp,1.17,1.18 system.h,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list