summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-08-16 18:00:44 +0200
committerJared Adams <jaxad0127@gmail.com>2010-08-17 09:02:04 -0600
commit2497269351b9ac46d4f0852f52244df7aa4d211b (patch)
tree6036ddc9297c2c95f1b13bf4657468ef86488790 /src
parent2b676bbf6fcf7dfd45cb33f06dacd2ca5bce19fe (diff)
downloadmana-2497269351b9ac46d4f0852f52244df7aa4d211b.tar.gz
mana-2497269351b9ac46d4f0852f52244df7aa4d211b.tar.bz2
mana-2497269351b9ac46d4f0852f52244df7aa4d211b.tar.xz
mana-2497269351b9ac46d4f0852f52244df7aa4d211b.zip
Add missing include and add enet files to codeblocks
The missing include generated compiler error on windows. Because of compiler warnings generated by enet, warnings are switched of for: * unknown #pragmas, which are for MSVC compiler * enumeration with missing case Reviewed-by: Bertram
Diffstat (limited to 'src')
-rw-r--r--src/log.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/log.cpp b/src/log.cpp
index 435b2da0..5880e108 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -19,9 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <iostream>
-#include <sstream>
-
#include "log.h"
#include "gui/widgets/chattab.h"
@@ -30,11 +27,12 @@
#include <windows.h>
#elif __APPLE__
#include <Carbon/Carbon.h>
-#elif __linux__ || __linux
-#include <stdlib.h>
#endif
#include <sys/time.h>
+#include <iostream>
+#include <sstream>
+#include <stdlib.h>
Logger::Logger():
mLogToStandardOut(true),