summaryrefslogtreecommitdiff
path: root/src/common/timer.c
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-06-19 12:48:19 +0200
committerHaruna <haru@dotalux.com>2015-06-19 12:48:19 +0200
commit61f0dcb9a812d057e28c53837327f99bcea4733e (patch)
tree76c299f94ef60fa6007321b8c403ebc93d8027c1 /src/common/timer.c
parentec7241c953392938cd3a8740bacb4c869636766f (diff)
parentf2fbdc16a14d07e0895cc09eeba689bc556481d2 (diff)
downloadhercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.gz
hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.bz2
hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.xz
hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.zip
Merge pull request #532 from MishimaHaruna/includes
Include paths
Diffstat (limited to 'src/common/timer.c')
-rw-r--r--src/common/timer.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/common/timer.c b/src/common/timer.c
index 45dbb9f50..06309642e 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -6,24 +6,23 @@
#include "timer.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "../common/cbasetypes.h"
-#include "../common/db.h"
-#include "../common/malloc.h"
-#include "../common/showmsg.h"
-#include "../common/utils.h"
+#include "common/cbasetypes.h"
+#include "common/db.h"
+#include "common/malloc.h"
+#include "common/showmsg.h"
+#include "common/utils.h"
#ifdef WIN32
-# include "../common/winapi.h" // GetTickCount()
+# include "common/winapi.h" // GetTickCount()
#else
# include <sys/time.h> // struct timeval, gettimeofday()
# include <unistd.h>
#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
struct timer_interface timer_s;
// If the server can't handle processing thousands of monsters