Make it compile with 4.6.1.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6694 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/src/addon/addon_manager.cpp b/src/addon/addon_manager.cpp
index cd899f0..562096c 100644 (file)
--- a/src/addon/addon_manager.cpp
+++ b/src/addon/addon_manager.cpp
@@ -29,7 +29,6 @@
 #ifdef HAVE_LIBCURL
 #  include <curl/curl.h>
 #  include <curl/easy.h>
-#  include <curl/types.h>
 #endif
 
 #include "addon/addon.hpp"

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 6ce60ac..b05d41e 100644 (file)
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -453,7 +453,6 @@ Menu::draw_item(DrawingContext& context, int index)
   Color text_color = default_color;
   float x_pos       = pos.x;
   float y_pos       = pos.y + 24*index - menu_height/2 + 12;
-  int shadow_size = 2;
   int text_width  = int(Resources::normal_font->get_text_width(pitem.text));
   int input_width = int(Resources::normal_font->get_text_width(pitem.input) + 10);
   int list_width = 0;
@@ -470,7 +469,6 @@ Menu::draw_item(DrawingContext& context, int index)
 
   if(index == active_item)
   {
-    shadow_size = 3;
     text_color = active_color;
   }
 

diff --git a/src/supertux/screen_manager.hpp b/src/supertux/screen_manager.hpp
index 0751365..d885443 100644 (file)
--- a/src/supertux/screen_manager.hpp
+++ b/src/supertux/screen_manager.hpp
@@ -18,6 +18,7 @@
 #define HEADER_SUPERTUX_SUPERTUX_MAINLOOP_HPP
 
 #include <memory>
+#include <cstddef>
 
 #include "scripting/thread_queue.hpp"