diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2020-11-30 19:58:02 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2020-12-02 18:31:57 +0300 |
| commit | 0d0f06416a155de1025e289c56e800de092750c4 (patch) | |
| tree | 09deedd9de4f270ce69ad8f5cf75d08284aa6d52 /winsup | |
| parent | aec6479820fee5f71d50930bf0dde2bbf386bd4b (diff) | |
Cygwin: Fix building of utils testsuite
Avoid referencing undefined max_mount_entry.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/utils/path.cc | 4 | ||||
| -rw-r--r-- | winsup/utils/path.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc index d8c208123..4c1bb4029 100644 --- a/winsup/utils/path.cc +++ b/winsup/utils/path.cc @@ -824,8 +824,10 @@ vcygpath (const char *cwd, const char *s, va_list v) size_t max_len = 0; mnt_t *m, *match = NULL; +#ifndef TESTSUITE if (!max_mount_entry) read_mounts (); +#endif char *path; if (s[0] == '.' && isslash (s[1])) s += 2; @@ -912,8 +914,10 @@ extern "C" FILE * setmntent (const char *, const char *) { m = mount_table; +#ifndef TESTSUITE if (!max_mount_entry) read_mounts (); +#endif return NULL; } diff --git a/winsup/utils/path.h b/winsup/utils/path.h index af5deeba6..a1840a003 100644 --- a/winsup/utils/path.h +++ b/winsup/utils/path.h @@ -24,8 +24,8 @@ bool from_fstab_line (mnt_t *m, char *line, bool user); #ifndef TESTSUITE extern mnt_t mount_table[255]; -#endif extern int max_mount_entry; +#endif #ifndef SYMLINK_MAX #define SYMLINK_MAX 4095 /* PATH_MAX - 1 */ |