summaryrefslogtreecommitdiff
path: root/stdafx.h
diff options
context:
space:
mode:
authortron <tron@openttd.org>2004-12-03 07:43:00 +0000
committertron <tron@openttd.org>2004-12-03 07:43:00 +0000
commitc00258237e0fd63d23fb2015c78c070b72b2e9d9 (patch)
treee39a57439be0a2878fec3147140ca4e16f6b00e6 /stdafx.h
parentb7f0b278fbff5721557c2f7d06f0f1892ed7bd39 (diff)
downloadopenttd-c00258237e0fd63d23fb2015c78c070b72b2e9d9.tar.xz
(svn r907) Sprinkle holy ANSI water:
- "inline" must before the return type (and after "static") - Initialise all struct members, not just some of them - Remove (one) spurious semicolon
Diffstat (limited to 'stdafx.h')
-rw-r--r--stdafx.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/stdafx.h b/stdafx.h
index 94524f6f5..abc6222a5 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -127,10 +127,10 @@ static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
#else
-static uint32 FORCEINLINE TO_BE32(uint32 x) { return BSWAP32(x); }
-static uint16 FORCEINLINE TO_BE16(uint16 x) { return BSWAP16(x); }
-static uint32 FORCEINLINE FROM_BE32(uint32 x) { return BSWAP32(x); }
-static uint16 FORCEINLINE FROM_BE16(uint16 x) { return BSWAP16(x); }
+static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); }
+static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); }
+static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); }
+static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); }
#define TO_LE32(x) x
#define TO_LE16(x) x
#define TO_BE32X(x) BSWAP32(x)
@@ -157,7 +157,7 @@ enum {
#endif
// Compile time assertions
-#define assert_compile(expr) void __ct_assert__(int a[1 - 2 * !(expr)]);
+#define assert_compile(expr) void __ct_assert__(int a[1 - 2 * !(expr)])
assert_compile(sizeof(uint32) == 4);
assert_compile(sizeof(uint16) == 2);