summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rw-r--r--src/chat-server/chathandler.cpp1
-rw-r--r--src/game-server/character.cpp1
-rw-r--r--src/utils/encryption.cpp1
-rw-r--r--src/utils/sha256.cpp1
5 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dfe86e3..2029655d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,20 @@
+2008-05-22 Roderic Morris <roderic@ccs.neu.edu>
+
+ * src/utils/sha256.cpp, src/utils/encryption.cpp,
+ src/chat-server/chathandler.cpp, src/game-server/character.cpp: Fixed
+ compilation with GCC 4.3.
+
2008-05-19 Philipp Sehmisch <tmw@crushnet.org>
* src/game-server/being.cpp, src/game-server/character.cpp,
src/game-server/character.hpp, src/game-server/mapreader.cpp,
src/game-server/npc.hpp, src/game-server/npc.cpp,
src/game-server/state.cpp, src/scripting/script.cpp,
- src/scripting/script.hpp, src/scripting/lua.cpp, data/scripts/libtmw.lua,
- data/test.lua: Implemented NPC names. Implemented the theoretical
- possibility to have named monsters along the way. Note that the syntax of
- the LUA functions for creating NPCs has changed.
+ src/scripting/script.hpp, src/scripting/lua.cpp,
+ data/scripts/libtmw.lua, data/test.lua: Implemented NPC names.
+ Implemented the theoretical possibility to have named monsters along
+ the way. Note that the syntax of the LUA functions for creating NPCs
+ has changed.
2008-05-18 Roderic Morris <roderic@ccs.neu.edu>
@@ -55,7 +62,7 @@
* src/chat-server/chathandler.cpp, src/defines.h, accountserver.cbp:
Added sending who accepted invite on invite response to client.
-2008-04_23 Yohann Ferreira <bertram@cegetel.net>
+2008-04-23 Yohann Ferreira <bertram@cegetel.net>
* src/account-server/accounthandler.cpp, src/defines.h: Realigned
email already exists error return value and removed getEmailAddress.
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 113ad1f8..d56f2b87 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -22,6 +22,7 @@
*/
#include <list>
+#include <algorithm>
#include "defines.h"
#include "chat-server/guild.hpp"
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index f169bd26..0c15ad6c 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -23,6 +23,7 @@
#include <algorithm>
#include <cassert>
#include <cmath>
+#include <limits.h>
#include "game-server/character.hpp"
diff --git a/src/utils/encryption.cpp b/src/utils/encryption.cpp
index b67b8f87..296a8631 100644
--- a/src/utils/encryption.cpp
+++ b/src/utils/encryption.cpp
@@ -24,6 +24,7 @@
#include "encryption.h"
#include <time.h>
+#include <stdlib.h>
using namespace Encryption;
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 98a47137..547425cc 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -71,6 +71,7 @@
*/
#include "sha256.h"
+#include <memory.h>
#ifdef HAS_STDINT
#include <stdint.h>