Merge pull request #8101 from keszybz/two-gcc-workarounds

Two gcc workarounds
2018-02-05 18:59:52 +01:00
parent fe16729868 3c3d384ae9
commit 960c7c2791
3 changed files with 12 additions and 2 deletions
@@ -29,6 +29,10 @@
 #include "path-util.h"
 #include "strv.h"

+static void _closedir(void* v) {
+        (void) closedir(v);
+}
+
 int safe_glob(const char *path, int flags, glob_t *pglob) {
        int k;

@@ -36,7 +40,7 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
        assert(!(flags & GLOB_ALTDIRFUNC));

        if (!pglob->gl_closedir)
-                pglob->gl_closedir = (void (*)(void *)) closedir;
+                pglob->gl_closedir = _closedir;
        if (!pglob->gl_readdir)
                pglob->gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot;
        if (!pglob->gl_opendir)