Merged revisions 3692 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk

........
  r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line
  
  Made it compile with GCC 4.3
........

11 files changed, 27 insertions, 7 deletions

diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 0379ebc0..e47f90f8 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -21,12 +21,14 @@
  *  $Id$
  */
 
-#include "button.h"
+#include <algorithm>
 
 #include <guichan/exception.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/imagefont.hpp>
 
+#include "button.h"
+
 #include "../graphics.h"
 
 #include "../resources/image.h"
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 44b332b1..877866df 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -21,13 +21,14 @@
  *  $Id$
  */
 
-#include "chat.h"
-
+#include <algorithm>
 #include <sstream>
 
 #include <guichan/focushandler.hpp>
 #include <guichan/key.hpp>
 
+#include "chat.h"
+
 #include "browserbox.h"
 #include "chatinput.h"
 #include "scrollarea.h"
diff --git a/src/gui/chat.h b/src/gui/chat.h
index ad325339..9c57f227 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -195,7 +195,7 @@ class ChatWindow : public Window, public gcn::ActionListener,
         bool mTmpVisible;
 
         /** One item in the chat log */
-        typedef struct CHATLOG
+        struct CHATLOG
         {
             std::string nick;
             std::string text;
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index e3f5b540..8e5f1827 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "playerbox.h"
 
 #include "../player.h"
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 816f94a8..cf555ef4 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "scrollarea.h"
 
 #include "../graphics.h"
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 7142c76b..3089e54a 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "setup.h"
 
 #include "button.h"
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 6406dd2a..3ab40c9a 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -21,10 +21,12 @@
  *  $Id$
  */
 
-#include "skill.h"
+#include <algorithm>
 
 #include <guichan/widgets/label.hpp>
 
+#include "skill.h"
+
 #include "button.h"
 #include "listbox.h"
 #include "scrollarea.h"
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index 5d6d21d1..8fb2f598 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "tabbedcontainer.h"
 
 #include "button.h"
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index ce7f6d5f..5b875da3 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -21,10 +21,12 @@
  *  $Id$
  */
 
-#include "textfield.h"
+#include <algorithm>
 
 #include <guichan/font.hpp>
 
+#include "textfield.h"
+
 #include "../graphics.h"
 
 #include "../resources/image.h"
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 90031545..b7ff79f7 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -21,11 +21,14 @@
  *  $Id$
  */
 
-#include "window.h"
+#include <algorithm>
+#include <climits>
 
 #include <guichan/exception.hpp>
 #include <guichan/widgets/icon.hpp>
 
+#include "window.h"
+
 #include "gui.h"
 #include "gccontainer.h"
 #include "windowcontainer.h"
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 14aaaf68..d10c519c 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "windowcontainer.h"
 
 #include "../utils/dtor.h"