summaryrefslogtreecommitdiff
path: root/src/common/thread.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-05-04 06:13:56 +0200
committerHaru <haru@dotalux.com>2014-05-09 08:29:46 +0200
commitb6b3f58795288701d0e162d43fa6f0a47af913b3 (patch)
treea75f686731786ed1746325589d8acb1569409981 /src/common/thread.c
parent1c4e3820d5f4ff9870c28104122f6733db4d55a6 (diff)
downloadhercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.gz
hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.bz2
hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.tar.xz
hercules-b6b3f58795288701d0e162d43fa6f0a47af913b3.zip
Fixed order of includes in all source files
- Changed order according to the (upcoming) code style guidelines. - Fixes several issues caused by missing headers when their include order is changed or in plugins. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common/thread.c')
-rw-r--r--src/common/thread.c31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/common/thread.c b/src/common/thread.c
index 4d110f2dd..4f73aa9b3 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -6,24 +6,27 @@
// Copyright (c) rAthena Project (www.rathena.org) - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
+#define HERCULES_CORE
+
+#include "thread.h"
+
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/showmsg.h"
+
#ifdef WIN32
-#include "../common/winapi.h"
-#define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
-#define __thread __declspec( thread )
+# include "../common/winapi.h"
+# define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.)
+# define __thread __declspec( thread )
#else
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <pthread.h>
-#include <sched.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <signal.h>
+# include <pthread.h>
+# include <sched.h>
#endif
-#include "cbasetypes.h"
-#include "malloc.h"
-#include "showmsg.h"
-#include "thread.h"
-
// When Compiling using MSC (on win32..) we know we have support in any case!
#ifdef _MSC_VER
#define HAS_TLS