From 1420656e08f65f3e5c963f82b10a718b8026d216 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 12 Jan 2010 14:19:47 -0700 Subject: Standardize header order Also remove some extra new lines and fix eAthena's PartyTab define guards. --- src/main.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/main.cpp') 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 +#ifdef WIN32 +#include +#else +#include +#include +#endif + #include #include #include @@ -99,13 +106,6 @@ #define usleep(usec) (Sleep ((usec) / 1000), 0) #endif -#ifdef WIN32 -#include -#else -#include -#include -#endif - namespace { class SetupListener : public gcn::ActionListener -- cgit v1.2.3-70-g09d2