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

[Philip Withnall <pwithnall src gnome org>]

commit 40a84b3d1ce255fb8508f0acd6379b6f19b7c156
Merge: dd51b05e1 e714e1e95
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Jun 19 11:19:43 2018 +0000

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

 gio/kqueue/gkqueuefilemonitor.c | 286 ++++++++++++++++++++++++++------
 gio/kqueue/kqueue-helper.c      |  21 ++-
 gio/kqueue/kqueue-helper.h      |  13 +-
 gio/kqueue/kqueue-missing.c     |  45 ++---
 gio/tests/testfilemonitor.c     | 359 +++++++++++++++++++++++++++++-----------
 5 files changed, 547 insertions(+), 177 deletions(-)
---