Merge svn changes up to r29277

2 files changed, 11 insertions, 8 deletions

diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c
index 64edfe7ef6..a6e5a987d1 100644
--- a/osdep/timer-darwin.c
+++ b/osdep/timer-darwin.c
@@ -51,19 +51,19 @@ int usec_sleep(int usec_delay)
 
 
 /* current time in microseconds */
-unsigned int GetTimer()
+unsigned int GetTimer(void)
 {
   return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6);
 }
 
 /* current time in milliseconds */
-unsigned int GetTimerMS()
+unsigned int GetTimerMS(void)
 {
   return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3);
 }
 
 /* initialize timer, must be called at least once at start */
-void InitTimer()
+void InitTimer(void)
 {
   struct mach_timebase_info timebase;
 
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index 576bae5be6..defb69ff7b 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -31,9 +31,9 @@
 
 const char timer_name[] =
 #ifdef HAVE_NANOSLEEP
-  "nanosleep()";
+    "nanosleep()";
 #else
-  "usleep()";
+    "usleep()";
 #endif
 
 int usec_sleep(int usec_delay)
@@ -49,19 +49,22 @@ int usec_sleep(int usec_delay)
 }
 
 // Returns current time in microseconds
-unsigned int GetTimer(void){
+unsigned int GetTimer(void)
+{
   struct timeval tv;
   gettimeofday(&tv,NULL);
   return tv.tv_sec * 1000000 + tv.tv_usec;
 }  
 
 // Returns current time in milliseconds
-unsigned int GetTimerMS(void){
+unsigned int GetTimerMS(void)
+{
   struct timeval tv;
   gettimeofday(&tv,NULL);
   return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 }  
 
 // Initialize timer, must be called at least once at start
-void InitTimer(void){
+void InitTimer(void)
+{
 }