Merge remote-tracking branch 'tor-gitlab/mr/354'

This commit is contained in:
George Kadianakis 2021-04-08 14:37:30 +03:00
commit 62614f0b3f
2 changed files with 6 additions and 0 deletions

4
changes/bug40354 Normal file
View File

@ -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.

View File

@ -533,6 +533,7 @@ unglob_win32(const char *pattern, int prev_sep, int next_sep)
return result; return result;
} }
#elif HAVE_GLOB #elif HAVE_GLOB
#ifdef GLOB_ALTDIRFUNC // prevent warning about unused functions
/** Same as opendir but calls sandbox_intern_string before */ /** Same as opendir but calls sandbox_intern_string before */
static DIR * static DIR *
prot_opendir(const char *name) prot_opendir(const char *name)
@ -571,6 +572,7 @@ wrap_closedir(void *arg)
{ {
closedir(arg); closedir(arg);
} }
#endif /* defined(GLOB_ALTDIRFUNC) */
/** Function passed to glob to handle processing errors. <b>epath</b> is the /** 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 * path that caused the error and <b>eerrno</b> is the errno set by the