Renamed main() to run

SVN-Revision: 6121

diff --git a/src/main.cpp b/src/main.cpp
index 44f7d12..2b4bd21 100644 (file)
--- 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 0f6e414..46c3e96 100644 (file)
--- 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 fc90144..22e4b13 100644 (file)
--- 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