summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-12-17 03:33:20 +0100
committerHaru <haru@dotalux.com>2013-12-17 04:15:22 +0100
commit3917562fc493c031bb20181b5d9ae6ab15ce9b76 (patch)
tree4b62aa52844a1916db1f18faba8b9cf29ff30810 /src
parent3cd9f8d14eaccaffaa642b5e46f50493c213e7d8 (diff)
downloadhercules-3917562fc493c031bb20181b5d9ae6ab15ce9b76.tar.gz
hercules-3917562fc493c031bb20181b5d9ae6ab15ce9b76.tar.bz2
hercules-3917562fc493c031bb20181b5d9ae6ab15ce9b76.tar.xz
hercules-3917562fc493c031bb20181b5d9ae6ab15ce9b76.zip
Fixed some additional linux warnings
- Fixed some warnings we had missed. - Improved -W cflag detection routines. - Only use -Wshadow if it's actually useful. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src')
-rw-r--r--src/common/timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/timer.c b/src/common/timer.c
index e5cf5df2a..7f9e20dad 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -142,7 +142,7 @@ static void rdtsc_calibrate(){
* platform-abstracted tick retrieval
* @return server's current tick
*/
-static int64 tick(void) {
+static int64 sys_tick(void) {
#if defined(WIN32)
// Windows: GetTickCount/GetTickCount64: Return the number of
// milliseconds that have elapsed since the system was started.
@@ -206,7 +206,7 @@ static int gettick_count = 1;
int64 timer_gettick_nocache(void) {
gettick_count = TICK_CACHE;
- gettick_cache = tick();
+ gettick_cache = sys_tick();
return gettick_cache;
}
@@ -219,11 +219,11 @@ int64 timer_gettick(void) {
// tick doesn't get cached
int64 timer_gettick_nocache(void)
{
- return tick();
+ return sys_tick();
}
int64 timer_gettick(void) {
- return tick();
+ return sys_tick();
}
//////////////////////////////////////////////////////////////////////////
#endif