public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin/main] newlib: posix: add HAVE_OPENDIR build condition for [n]ftw.c
Date: Thu, 13 Jul 2023 17:58:56 +0000 (GMT)	[thread overview]
Message-ID: <20230713175856.A8E3C3858D32@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b7c3a63bb3c4dab861b2bce8793b8dfb36151799

commit b7c3a63bb3c4dab861b2bce8793b8dfb36151799
Author:     Alexey Lapshin <alexey.lapshin@espressif.com>
AuthorDate: Thu Jul 13 09:52:26 2023 +0000
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Thu Jul 13 19:58:29 2023 +0200

    newlib: posix: add HAVE_OPENDIR build condition for [n]ftw.c

Diff:
---
 newlib/libc/posix/ftw.c  | 3 +++
 newlib/libc/posix/nftw.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/newlib/libc/posix/ftw.c b/newlib/libc/posix/ftw.c
index 18cfc24cbf1e..79e63582ce7d 100644
--- a/newlib/libc/posix/ftw.c
+++ b/newlib/libc/posix/ftw.c
@@ -1,3 +1,5 @@
+#ifndef HAVE_OPENDIR
+
 /*
 * Copyright © 2005-2020 Rich Felker, et al.
 *
@@ -31,3 +33,4 @@ int ftw(const char *path, int (*fn)(const char *, const struct stat *, int), int
 	return nftw(path, (int (*)())fn, fd_limit, FTW_PHYS);
 }
 
+#endif /* ! HAVE_OPENDIR */
diff --git a/newlib/libc/posix/nftw.c b/newlib/libc/posix/nftw.c
index c45cc8f17208..17c5bfd1e3aa 100644
--- a/newlib/libc/posix/nftw.c
+++ b/newlib/libc/posix/nftw.c
@@ -1,3 +1,5 @@
+#ifndef HAVE_OPENDIR
+
 /*
 * Copyright © 2005-2020 Rich Felker, et al.
 *
@@ -154,3 +156,4 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
 	return r;
 }
 
+#endif /* ! HAVE_OPENDIR */

                 reply	other threads:[~2023-07-13 17:58 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=20230713175856.A8E3C3858D32@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-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: link
Be 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).