Improve fix for #525192 below: Use SleepEx() so that the sleep is

2008-03-31  Tor Lillqvist  <tml@novell.com>

	* glib/gmain.c (g_poll): Improve fix for #525192 below: Use
	SleepEx() so that the sleep is alertable. Thanks to John
	Ehresman.

svn path=/trunk/; revision=6794

diff --git a/ChangeLog b/ChangeLog
index 0ba3b0f..3c9f91e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-03-31  Tor Lillqvist  <tml@novell.com>
 
+       * glib/gmain.c (g_poll): Improve fix for #525192 below: Use
+       SleepEx() so that the sleep is alertable. Thanks to John
+       Ehresman.
+
+2008-03-31  Tor Lillqvist  <tml@novell.com>
+
        * glib/gwin32.c
        (g_win32_get_package_installation_directory_of_module): Fix Cygwin
        breakage. Patch by Lieven van der Heide.

diff --git a/glib/gmain.c b/glib/gmain.c
index d833efc..28292ba 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -388,7 +388,7 @@ g_poll (GPollFD *fds,
        ready = WAIT_FAILED;
       else
        {
-         Sleep (timeout);
+         SleepEx (timeout, TRUE);
          ready = WAIT_TIMEOUT;
        }
     }