Merge branch 'master' of git://github.com/binki/libmowgli-2 (closes #20)

Conflicts:
	src/libmowgli/platform/win32/win32_stdinc.h

diff --git a/src/libmowgli/eventloop/null_pollops.c b/src/libmowgli/eventloop/null_pollops.c
index b62f2e104927cb504e5fe804f87357b23b323437..7788aec59272457b3fbb6f27a9c0afb061a07f22 100644 (file)
--- a/src/libmowgli/eventloop/null_pollops.c
+++ b/src/libmowgli/eventloop/null_pollops.c
@@ -114,6 +114,8 @@ mowgli_null_eventloop_setselect(mowgli_eventloop_t *eventloop, mowgli_eventloop_
 static void
 mowgli_null_eventloop_select(mowgli_eventloop_t *eventloop, int time)
 {
+       for (; time > 999999; time -= 999999)
+               usleep(999999);
        usleep(time);
 }
 

diff --git a/src/libmowgli/platform/win32/win32_stdinc.h b/src/libmowgli/platform/win32/win32_stdinc.h
index 5e0b7d218ee5925a2476246415b0d8b7abd1b4e8..e4e1d05c4c3ec49e4035949a6a9bf252b4814e1f 100644 (file)
--- a/src/libmowgli/platform/win32/win32_stdinc.h
+++ b/src/libmowgli/platform/win32/win32_stdinc.h
@@ -32,7 +32,6 @@
 
 # define strcasecmp _stricmp
 # define strdup _strdup
-# define usleep(_usecs) Sleep((_usecs) / 1000L)
 # ifdef _MSC_VER
 #  define snprintf _snprintf
 # endif