diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-01-12 14:19:47 -0700 |
|---|---|---|
| committer | Jared <jaxad0127@gmail.com> | 2010-01-12 14:41:34 -0700 |
| commit | 1420656e08f65f3e5c963f82b10a718b8026d216 (patch) | |
| tree | 262441cb8f9587b982f9078398844021c0d22de0 /src/main.cpp | |
| parent | d18b9fb1aa086d3ed0187d61940564f197411cf4 (diff) | |
| download | Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.gz Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.bz2 Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.xz Mana-1420656e08f65f3e5c963f82b10a718b8026d216.zip | |
Standardize header order
Also remove some extra new lines and fix eAthena's PartyTab define guards.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main.cpp b/src/main.cpp index 9789ee46..69b45091 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,11 +38,6 @@ #include "statuseffect.h" #include "units.h" -#include "gui/widgets/button.h" -#include "gui/widgets/desktop.h" -#include "gui/widgets/label.h" -#include "gui/widgets/progressbar.h" - #include "gui/changeemaildialog.h" #include "gui/changepassworddialog.h" #include "gui/charselectdialog.h" @@ -61,6 +56,11 @@ #include "gui/updatewindow.h" #include "gui/worldselectdialog.h" +#include "gui/widgets/button.h" +#include "gui/widgets/desktop.h" +#include "gui/widgets/label.h" +#include "gui/widgets/progressbar.h" + #include "net/charhandler.h" #include "net/gamehandler.h" #include "net/generalhandler.h" @@ -84,6 +84,13 @@ #include <libxml/parser.h> +#ifdef WIN32 +#include <SDL_syswm.h> +#else +#include <cerrno> +#include <sys/stat.h> +#endif + #include <getopt.h> #include <iostream> #include <physfs.h> @@ -99,13 +106,6 @@ #define usleep(usec) (Sleep ((usec) / 1000), 0) #endif -#ifdef WIN32 -#include <SDL_syswm.h> -#else -#include <cerrno> -#include <sys/stat.h> -#endif - namespace { class SetupListener : public gcn::ActionListener |