more svn:eol-style = native and header fixes

SVN-Revision: 5778

diff --git a/src/addon/addon.cpp b/src/addon/addon.cpp
index 4e8c9f6..3771161 100644 (file)
--- a/src/addon/addon.cpp
+++ b/src/addon/addon.cpp
@@ -23,6 +23,9 @@
 #include <sstream>
 #include <stdexcept>
 #include <physfs.h>
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
+#include "lisp/parser.hpp"
 #include "addon/addon.hpp"
 #include "addon/addon_manager.hpp"
 #include "log.hpp"

diff --git a/src/addon/addon.hpp b/src/addon/addon.hpp
index a630435..a07be26 100644 (file)
--- a/src/addon/addon.hpp
+++ b/src/addon/addon.hpp
@@ -23,11 +23,11 @@
 
 #include <string>
 #include <vector>
-#include "lisp/parser.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 
-class Addon;
+namespace lisp {
+class Writer;
+class Lisp;
+}
 
 #include "addon/addon_manager.hpp"
 

diff --git a/src/addon/addon_manager.cpp b/src/addon/addon_manager.cpp
index cf7ab80..9d45ae9 100644 (file)
--- a/src/addon/addon_manager.cpp
+++ b/src/addon/addon_manager.cpp
@@ -28,17 +28,19 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include "addon/addon_manager.hpp"
+#include "addon/addon.hpp"
 #include "config.h"
 #include "log.hpp"
 #include "lisp/parser.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/list_iterator.hpp"
+#include "lisp/writer.hpp"
 #include "physfs/physfs_stream.hpp"
 
 #ifdef HAVE_LIBCURL
-#include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
+#include <curl.h>
+#include <types.h>
+#include <easy.h>
 #endif
 
 #ifdef HAVE_LIBCURL

diff --git a/src/addon/md5.hpp b/src/addon/md5.hpp
index 6d1e921..f6aa930 100644 (file)
--- a/src/addon/md5.hpp
+++ b/src/addon/md5.hpp
@@ -41,6 +41,9 @@
 // documentation and/or software.
 // 
 
+#ifndef SUPERTUX_ADDON_MD5_HPP
+#define SUPERTUX_ADDON_MD5_HPP
+
 #include <stdio.h>
 #include <fstream>
 #include <iostream>
@@ -92,3 +95,5 @@ class MD5 {
     static inline void II(uint32_t& a, uint32_t b, uint32_t c, uint32_t d, uint32_t x, uint32_t s, uint32_t ac);
 
 };
+
+#endif /*SUPERTUX_ADDON_MD5_HPP*/

diff --git a/src/object/lantern.hpp b/src/object/lantern.hpp
index b8498a3..7daed4b 100644 (file)
--- a/src/object/lantern.hpp
+++ b/src/object/lantern.hpp
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __SUPERTUX_LANTERN_H__
-#define __SUPERTUX_LANTERN_H___
+#define __SUPERTUX_LANTERN_H__
 
 #include "object/moving_sprite.hpp"
 #include "object/rock.hpp"

diff --git a/src/object/magicblock.hpp b/src/object/magicblock.hpp
index 64d9add..43b0a18 100644 (file)
--- a/src/object/magicblock.hpp
+++ b/src/object/magicblock.hpp
@@ -24,8 +24,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef SUPERTUX_TRAMPOLINE_H
-#define SUPERTUX_TRAMPOLINE_H
+#ifndef SUPERTUX_MAGICBLOCK_H
+#define SUPERTUX_MAGICBLOCK_H
 
 #include "moving_sprite.hpp"
 #include "lisp/lisp.hpp"

diff --git a/src/object/pushbutton.hpp b/src/object/pushbutton.hpp
index 55f3fc7..a615e85 100644 (file)
--- a/src/object/pushbutton.hpp
+++ b/src/object/pushbutton.hpp
@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef SUPERTUX_BUTTON_H
-#define SUPERTUX_BUTTON_H
+#ifndef SUPERTUX_PUSHBUTTON_H
+#define SUPERTUX_PUSHBUTTON_H
 
 #include "moving_sprite.hpp"
 #include "lisp/lisp.hpp"

diff --git a/src/scripting/camera.hpp b/src/scripting/camera.hpp
index 558c207..9d65cf3 100644 (file)
--- a/src/scripting/camera.hpp
+++ b/src/scripting/camera.hpp
@@ -23,6 +23,7 @@
 #ifndef SCRIPTING_API
 class Camera;
 typedef Camera _Camera;
+#include <string>
 #endif
 
 namespace Scripting

diff --git a/src/scripting/squirrel_util.cpp b/src/scripting/squirrel_util.cpp
index e25887d..a5b1c1d 100644 (file)
--- a/src/scripting/squirrel_util.cpp
+++ b/src/scripting/squirrel_util.cpp
@@ -31,7 +31,7 @@
 #include "log.hpp"
 #include "level.hpp"
 #include "physfs/physfs_stream.hpp"
-#include "../random_generator.hpp"
+#include "random_generator.hpp"
 
 #ifdef ENABLE_SQDBG
 #include <sqdbg/sqrdbg.h>

diff --git a/src/tinygettext/findlocale.cpp b/src/tinygettext/findlocale.cpp
index dbcb961..2042b40 100644 (file)
--- a/src/tinygettext/findlocale.cpp
+++ b/src/tinygettext/findlocale.cpp
@@ -182,7 +182,7 @@ canonize_fl(FL_Locale *l) {
 #define RML(pn,sn) MAKELANGID(LANG_##pn, SUBLANG_##sn)
 typedef struct {
   LANGID id;
-  char*  code;
+  const char* code;
 } IDToCode;
 static const IDToCode both_to_code[] = {
   {ML(ENGLISH,US),           "en_US.ISO_8859-1"},