Merge branch 'master' of https://github.com/erwincoumans/bullet3

2016-08-18 15:54:43 -07:00
parent 2c636b52f7 013a702b2f
commit 8c2b1386ce
1 changed files with 1 additions and 1 deletions
--- a/examples/Utils/b3Clock.cpp
+++ b/examples/Utils/b3Clock.cpp
@@ -239,7 +239,7 @@ void b3Clock::usleep(int microSeconds)
 	Sleep(millis);
 #else

-    usleep(microSeconds); 
+    ::usleep(microSeconds); 
 	//struct timeval tv;
 	//tv.tv_sec = microSeconds/1000000L;
 	//tv.tv_usec = microSeconds%1000000L;