[glib: 2/2] Merge branch 'win32-usleep-ceil' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit a431f4fe3e670587111ab877e4dc762a03a599e5
Merge: 17d278e1d 01c02ac08
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon May 28 10:18:28 2018 +0000

    Merge branch 'win32-usleep-ceil' into 'master'
    
    g_usleep: round up the next millisecond on Windows. See #1371
    
    See merge request GNOME/glib!24

 glib/gtimer.c               | 3 ++-
 gobject/tests/threadtests.c | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
---