diff options
| author | George Kadianakis <desnacked@riseup.net> | 2021-04-08 14:37:30 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2021-04-08 14:37:30 +0300 |
| commit | 62614f0b3f6432d3e9f67869594c4e1d7984c147 (patch) | |
| tree | 2ad02148adb1d3a959bd19bab4a8b0288d12fba0 | |
| parent | e0b8a79b2e62c69d45cce792f14b127e926082e2 (diff) | |
| parent | 272cb803df02179bd6d406d0188df588d445db1b (diff) | |
| download | tor-62614f0b3f6432d3e9f67869594c4e1d7984c147.tar.gz tor-62614f0b3f6432d3e9f67869594c4e1d7984c147.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/354'
| -rw-r--r-- | changes/bug40354 | 4 | ||||
| -rw-r--r-- | src/lib/fs/path.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug40354 b/changes/bug40354 new file mode 100644 index 0000000000..da7c63d3af --- /dev/null +++ b/changes/bug40354 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning about unused functions when building with + a libc that lacks the GLOB_ALTDIRFUNC constant. Fixes bug 40354; + bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto. diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index 81eb3aa661..8194d920ab 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -533,6 +533,7 @@ unglob_win32(const char *pattern, int prev_sep, int next_sep) return result; } #elif HAVE_GLOB +#ifdef GLOB_ALTDIRFUNC // prevent warning about unused functions /** Same as opendir but calls sandbox_intern_string before */ static DIR * prot_opendir(const char *name) @@ -571,6 +572,7 @@ wrap_closedir(void *arg) { closedir(arg); } +#endif /* defined(GLOB_ALTDIRFUNC) */ /** Function passed to glob to handle processing errors. <b>epath</b> is the * path that caused the error and <b>eerrno</b> is the errno set by the |