From 655e5b7ee2959ea780daa81406ff445af2261ca4 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 4 Feb 2006 23:03:35 +0000 Subject: (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. --- stdafx.h | 10 +++++----- 1 file 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 #include +/* 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 #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); } -- cgit v1.2.3-70-g09d2