# HG changeset patch
# User Chris Cannam
# Date 1146837849 0
# Node ID ac89a106f15511a6ed1f7e0a3089a49752a96fae
# Parent  174d33f28824379331e39b4305c28886968368aa
...

diff -r 174d33f28824 -r ac89a106f155 base/System.cpp
--- a/base/System.cpp	Fri May 05 13:31:23 2006 +0000
+++ b/base/System.cpp	Fri May 05 14:04:09 2006 +0000
@@ -27,7 +27,7 @@
 
 void usleep(unsigned long usec)
 {
-    Sleep(usec / 1000);
+    ::Sleep(usec / 1000);
 }
 
 void gettimeofday(struct timeval *tv, void *tz)
@@ -37,7 +37,7 @@
 	FILETIME ft; 
     } now; 
     
-    GetSystemTimeAsFileTime(&now.ft); 
+    ::GetSystemTimeAsFileTime(&now.ft); 
     tv->tv_usec = (long)((now.ns100 / 10LL) % 1000000LL); 
     tv->tv_sec = (long)((now.ns100 - 116444736000000000LL) / 10000000LL); 
 }