mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Daniel Sabogal <dsabogalcc@gmail.com>
To: musl@lists.openwall.com
Subject: [PATCH] move wcswcs prototype under feature test
Date: Sat, 17 Sep 2016 10:36:44 -0400	[thread overview]
Message-ID: <20160917143644.3654-2-dsabogalcc@gmail.com> (raw)
In-Reply-To: <20160917143644.3654-1-dsabogalcc@gmail.com>

wcswcs was an xsi extension removed in issue 7 of posix.
openbsd and netbsd also provide this prototype so we expose it
under _BSD_SOURCE as well.
---
 include/wchar.h     | 6 +++++-
 src/string/wcswcs.c | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/wchar.h b/include/wchar.h
index 3e6db5f..7503daf 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -67,7 +67,6 @@ wchar_t *wcstok (wchar_t *__restrict, const wchar_t *__restrict, wchar_t **__res
 size_t wcslen (const wchar_t *);
 
 wchar_t *wcsstr (const wchar_t *__restrict, const wchar_t *__restrict);
-wchar_t *wcswcs (const wchar_t *, const wchar_t *);
 
 wchar_t *wmemchr (const wchar_t *, wchar_t, size_t);
 int wmemcmp (const wchar_t *, const wchar_t *, size_t);
@@ -168,6 +167,11 @@ int wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
 size_t wcsxfrm_l(wchar_t *__restrict, const wchar_t *__restrict, size_t n, locale_t);
 #endif
 
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \
+	|| (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE < 700)
+wchar_t *wcswcs (const wchar_t *, const wchar_t *);
+#endif
+
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 int wcwidth (wchar_t);
 int wcswidth (const wchar_t *, size_t);
diff --git a/src/string/wcswcs.c b/src/string/wcswcs.c
index 9cfe4ac..9246733 100644
--- a/src/string/wcswcs.c
+++ b/src/string/wcswcs.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <wchar.h>
 
 wchar_t *wcswcs(const wchar_t *haystack, const wchar_t *needle)
-- 
2.10.0



  reply	other threads:[~2016-09-17 14:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-17 14:36 [PATCH] fix clock_nanosleep error case Daniel Sabogal
2016-09-17 14:36 ` Daniel Sabogal [this message]
2016-09-17 14:57 ` Szabolcs Nagy

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=20160917143644.3654-2-dsabogalcc@gmail.com \
    --to=dsabogalcc@gmail.com \
    --cc=musl@lists.openwall.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

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 NNTP newsgroup(s).