Merge branch '0.6'

6 files changed, 12 insertions, 6 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;
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 6c75797d..3cab9f97 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -106,7 +106,7 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "guialpha", 0.8f);
     AddDEF(configData, "ChatLogLength", 0);
     AddDEF(configData, "enableChatLog", false);
-    AddDEF(configData, "whispertab", false);
+    AddDEF(configData, "whispertab", true);
     AddDEF(configData, "customcursor", true);
     AddDEF(configData, "showownname", false);
     AddDEF(configData, "showpickupparticle", false);
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 45b092a4..b43078a4 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -98,7 +98,8 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
         int getContainerHeight() const
         { return mWidgetContainer->getHeight(); }
 
-        using gcn::TabbedArea::setSelectedTab;
+        void setSelectedTab(unsigned int index)
+        { gcn::TabbedArea::setSelectedTab(index); }
 
         void setSelectedTab(gcn::Tab *tab);
 
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 28654032..94cada41 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -63,6 +63,7 @@ struct TextHistory {
 
 class AutoCompleteLister {
 public:
+    virtual ~AutoCompleteLister() {}
     virtual void getAutoCompleteList(std::vector<std::string>&) const {}
 };
 
diff --git a/src/net/download.h b/src/net/download.h
index c0bdf204..26810f3f 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -18,6 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cstdlib> // pulls in int64_t
 #include <cstdio>
 #include <string>
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 15311083..d7859ad3 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -78,7 +78,7 @@ class ItemDB
           mLoaded(false)
         {}
 
-        ~ItemDB()
+        virtual ~ItemDB()
         {}
 
         /**