fix warning, use Sleep, not _sleep on windows (cherry picked from commit ea36c743ad60...

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 7011d318975b3bc6ecb2f7a0ee2f8b572e087b38..e700f7650c974fec112c00c504746578e62bba5f 100644 (file)
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -17,10 +17,6 @@ add_subdirectory( name-test )
 
 #INCLUDES=-I$(top_srcdir) $(DBUS_test-CFLAGS) 
 
-if (WIN32)
-add_definitions(-Dsleep=_sleep)
-endif (WIN32)
-
 #if (DBUS_BUILD_TESTS)
 ## break-loader removed for now
 #test-BINARIES=test-service test-names test-shell-service shell-test spawn-test test-segfault test-exit test-sleep-forever

diff --git a/test/test-sleep-forever.c b/test/test-sleep-forever.c
index ff0d8e267228ec71d86841c8091091db73b1fbd8..d54769abca5268d4978eccc21656d85f0ca5cc11 100644 (file)
--- a/test/test-sleep-forever.c
+++ b/test/test-sleep-forever.c
@@ -6,11 +6,17 @@
 #include <unistd.h>
 #endif
 
+#ifdef DBUS_WIN
+# include <windows.h>
+# define sleep Sleep
+#endif
+
+
 int
 main (int argc, char **argv)
 {
   while (1)
     sleep (10000000);
-  
+
   return 1;
 }