public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Jon TURNEY <jturney@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Fix building of utils testsuite Date: Wed, 2 Dec 2020 15:32:25 +0000 (GMT) [thread overview] Message-ID: <20201202153225.5F1E8395C809@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0d0f06416a155de1025e289c56e800de092750c4 commit 0d0f06416a155de1025e289c56e800de092750c4 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Mon Nov 30 16:58:02 2020 +0000 Cygwin: Fix building of utils testsuite Avoid referencing undefined max_mount_entry. Diff: --- winsup/utils/path.cc | 4 ++++ winsup/utils/path.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 */
reply other threads:[~2020-12-02 15:32 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201202153225.5F1E8395C809@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).