[glib: 4/4] Merge branch 'wip/lantw/freebsd-kqueue-simple' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit e3280675f51466cde58a5703633d682b566f2fd2
Merge: d1e2ef56e f28889848
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jun 8 21:36:27 2018 +0000

    Merge branch 'wip/lantw/freebsd-kqueue-simple' into 'master'
    
    FreeBSD kqueue file monitor fixes: the simple parts
    
    See merge request GNOME/glib!76

 gio/kqueue/gkqueuefilemonitor.c |  2 +-
 gio/tests/file.c                | 10 +++++++++-
 gio/tests/monitor.c             | 16 ++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)
---