From: grumbel <grumbel@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Thu, 26 Nov 2009 22:08:02 +0000 (+0000)
Subject: Renamed main() to run
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=90a16fe6dc32c37039d86c9bb220a5c95a1195f6;p=supertux.git

Renamed main() to run


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

diff --git a/src/main.cpp b/src/main.cpp
index 44f7d12ab..2b4bd2160 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@
 
 int main(int argc, char** argv)
 {
-  return Main().SDL_main(argc, argv);
+  return Main().run(argc, argv);
 }
 
 /* EOF */
diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 0f6e41493..46c3e9630 100644
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -528,7 +528,7 @@ static inline void timelog(const char* )
 #endif
 
 int
-Main::main(int argc, char** argv)
+Main::run(int argc, char** argv)
 {
   int result = 0;
 
diff --git a/src/supertux/main.hpp b/src/supertux/main.hpp
index fc9014448..22e4b1350 100644
--- a/src/supertux/main.hpp
+++ b/src/supertux/main.hpp
@@ -34,7 +34,9 @@ private:
   void wait_for_event(float min_delay, float max_delay);
 
 public:
-  int  main(int argc, char** argv);
+  /** We call it run() instead of main() as main collides with 
+      #define main SDL_main from SDL.h */
+  int run(int argc, char** argv);
 };
 
 #endif