projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Renamed main() to run
[supertux.git]
/
src
/
supertux
/
main.hpp
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