[glib: 2/2] Merge branch 'build-fix-mingw-libelf' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 433770b68118d29ec2708378d31c5c464bee276a
Merge: 83a4cab12 70ad48450
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Aug 1 23:18:53 2018 +0000

    Merge branch 'build-fix-mingw-libelf' into 'master'
    
    gresource-tool: fix build in case libelf is available on Windows. Fixes #1466
    
    Closes #1466
    
    See merge request GNOME/glib!215

 .gitlab-ci/test-msys2.sh |  3 ++-
 gio/gresource-tool.c     | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)
---