summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-02-04 23:03:35 +0000
committerDarkvater <darkvater@openttd.org>2006-02-04 23:03:35 +0000
commita9211aebf7056eb160d2eb325d8eef5652a9d7bd (patch)
tree914a2429aac089b07445d121bad77082b9744f92
parent64f14ed992ee6ee029698c89d637727c15b86db2 (diff)
downloadopenttd-a9211aebf7056eb160d2eb325d8eef5652a9d7bd.tar.xz
(svn r3549) - Change the behaviour of OTTD_ALIGNMENT. Force aligned reading as default, undefine it if unwanted/unneeded for some reason. I undeffed windows and watcom for now as they were like this.
-rw-r--r--stdafx.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/stdafx.h b/stdafx.h
index 16933ab73..6819bfb56 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -7,6 +7,9 @@
#include <string.h>
#include <stdlib.h>
+/* Default to forced alignment-reading. Undef if wanted */
+#define OTTD_ALIGNMENT
+
// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal
// strgen always runs from terminal and don't need a window for asserts
#if !defined(__APPLE__) || defined(STRGEN)
@@ -82,6 +85,7 @@
# define CDECL
# define NOT_REACHED() assert(0)
# define GCC_PACK
+# undef OTTD_ALIGNMENT
# include <malloc.h>
#endif /* __WATCOMC__ */
@@ -131,6 +135,7 @@
# endif
# endif /* _MSC_VER < 1300 */
+# undef OTTD_ALIGNMENT
# define GCC_PACK
// This is needed to zlib uses the stdcall calling convention on visual studio, also used with libpng (VS6 warning)
@@ -189,13 +194,8 @@ typedef unsigned char byte;
typedef unsigned __int64 uint64;
#endif /* __BEOS__ */
-#if defined(ARM) || defined(__arm__)
-# define OTTD_ALIGNMENT
-#endif
-
// Setup alignment and conversion macros
#if defined(TTD_BIG_ENDIAN)
-# define OTTD_ALIGNMENT
static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); }
static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }