From 86154175f63a7f1a4b73b3727314ac760d83834e Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 5 May 2012 18:12:36 +0200 Subject: Fixed compilation errors and warnings with GCC 4.7 Also, since GCC 4.7 there is a binary compatibility issue when linking with a Guichan that was not compiled in C++11 mode. This commit also allows compiling with GCC 4.7 with C++11 mode turned off. Reviewed-by: Erik Schilling --- src/cpp0x_compat/cstdint | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/cpp0x_compat') diff --git a/src/cpp0x_compat/cstdint b/src/cpp0x_compat/cstdint index d8d71d9d..05d56c6e 100644 --- a/src/cpp0x_compat/cstdint +++ b/src/cpp0x_compat/cstdint @@ -1,7 +1,10 @@ /* * Compatibility header used when the compiler doesn't support C++0x. * - * It doesn't seem necessary for it to contain anything, at least GCC 4.2.1 - * compiles Mana fine so it apparently understands types like uint16_t by - * default. + * While GCC 4.2.1 understands types like uint16_t by default, later versions + * are more strict so here are some typedefs for types used in our code. */ + +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; -- cgit v1.2.3-70-g09d2