mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 04/18] scripts: includes: restrict strlcpy prototype to glibc
Date: Mon, 27 May 2019 11:57:30 +0200	[thread overview]
Message-ID: <20190527095744.5923-5-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20190527095744.5923-1-a.fatoum@pengutronix.de>

Defining strlcpy here clashes on macOS, which has some compiler magic
around their strlcpy declaration. Fix this by inverting the check
to declare the prototype only if we are on __GLIBC__. As uClibc may
define __GLIBC__ as well, check for absence of its __UCLIBC__.

This is in-line with what Linux has been doing since 0215d59b15
("tools lib: Reinstate strlcpy() header guard with __UCLIBC__").

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 scripts/include/linux/string.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/include/linux/string.h b/scripts/include/linux/string.h
index e26223f1f287..649287b80a8c 100644
--- a/scripts/include/linux/string.h
+++ b/scripts/include/linux/string.h
@@ -8,7 +8,11 @@ void *memdup(const void *src, size_t len);
 
 int strtobool(const char *s, bool *res);
 
-#ifndef __UCLIBC__
+/*
+ * glibc based builds needs the extern while uClibc doesn't.
+ * However uClibc headers also define __GLIBC__ hence the hack below
+ */
+#if defined(__GLIBC) && !defined(__UCLIBC__)
 extern size_t strlcpy(char *dest, const char *src, size_t size);
 #endif
 
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-05-27  9:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-27  9:57 [PATCH 00/18] scripts: enable compilation on macOS Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 01/18] kbuild: suppress warnings from 'getconf LFS_*' Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 02/18] kbuild: Use ls(1) instead of stat(1) to obtain file size Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 03/18] scripts: extract symbol offsets using target, not host, nm Ahmad Fatoum
2019-05-27  9:57 ` Ahmad Fatoum [this message]
2019-05-27  9:57 ` [PATCH 05/18] scripts: compiler.h: don't include <stdint.h> twice Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 06/18] scripts: don't depend on system <asm/types.h> Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 07/18] scripts: bareboxcrc32: remove usage of loff_t Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 08/18] scripts: bareboximd: " Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 09/18] scripts: compiler.h: add endianness helpers for macOS Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 10/18] scripts: use "compiler.h" endianness helpers Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 11/18] scripts: mkimage: s/fdatasync/fsync/ on macOS & OpenBSD Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 12/18] scripts: removes uses of <asm*/errno.h> in favor of <errno.h> Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 13/18] scripts: omap3-usb-loader: don't depend on unportable le32toh Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 14/18] scripts: omap3-usb-loader: drop unneeded header Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 15/18] scripts: imx-usb-loader: don't depend on unportable headers Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 16/18] scripts: kwbimage: fix build with non-glibc systems Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 17/18] scripts: compiler.h: use Linux <endian.h> as default Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 18/18] scripts: compiler.h: support BSDs as well Ahmad Fatoum
2019-05-28  8:36 ` [PATCH 00/18] scripts: enable compilation on macOS Sascha Hauer

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=20190527095744.5923-5-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.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