summaryrefslogtreecommitdiff
path: root/src/cpp0x_compat
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-05-05 18:12:36 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-05-05 22:26:32 +0200
commit86154175f63a7f1a4b73b3727314ac760d83834e (patch)
tree5507b93f5ef8f4cb01b46233050230f9d12f9ef5 /src/cpp0x_compat
parentc32c1746b43f3f7869bbbf3c86533bf5a5d57a29 (diff)
downloadmana-client-86154175f63a7f1a4b73b3727314ac760d83834e.tar.gz
mana-client-86154175f63a7f1a4b73b3727314ac760d83834e.tar.bz2
mana-client-86154175f63a7f1a4b73b3727314ac760d83834e.tar.xz
mana-client-86154175f63a7f1a4b73b3727314ac760d83834e.zip
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
Diffstat (limited to 'src/cpp0x_compat')
-rw-r--r--src/cpp0x_compat/cstdint9
1 files changed, 6 insertions, 3 deletions
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;