Merge pull request #237 from HerculesWS/warnings

This adds an Xcode project file (for those who develop on OS X) and fixes several - potential or real - issues we detected thanks to its more strict warnings settings. It also updates the unix build script with similar warning settings.

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