From: Stefan Hajnoczi <stefanha@gmail.com>
To: John Arbuckle <programmingkidx@gmail.com>
Cc: david@gibson.dropbear.id.au, richard.henderson@linaro.org,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
peter.maydell@linaro.org, devicetree-compiler@vger.kernel.org,
ian@freebsd.org
Subject: Re: [Qemu-devel] [libfdt][PATCH v3] implement strnlen for systems that need it
Date: Mon, 23 Oct 2017 18:09:59 +0200 [thread overview]
Message-ID: <20171023160959.GC10220@stefanha-x1.localdomain> (raw)
In-Reply-To: <20171023025016.3088-1-programmingkidx@gmail.com>
On Sun, Oct 22, 2017 at 10:50:16PM -0400, John Arbuckle wrote:
> Prior the Mac OS 10.7, the function strnlen() was not available. This patch
> implements strnlen() on Mac OS X versions that are below 10.7.
>
> Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
> ---
> v3 changes:
> - Replaced loop with memchr()
>
> v2 changes:
> - Simplified the code to make it static inline'ed
> - Changed the type of count to size_t
>
> libfdt/libfdt_env.h | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
> index 952056c..d43b66b 100644
> --- a/libfdt/libfdt_env.h
> +++ b/libfdt/libfdt_env.h
> @@ -109,4 +109,28 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
> #undef CPU_TO_FDT16
> #undef EXTRACT_BYTE
>
> +#ifdef __APPLE__
> +#include <AvailabilityMacros.h>
> +
> +#define MAC_OS_X_VERSION_10_7 1070
Apple has already defined MAC_OS_X_VERSION_10_7 here:
https://opensource.apple.com/source/xnu/xnu-1699.24.8/EXTERNAL_HEADERS/AvailabilityMacros.h
To avoid a compiler warning, please use:
#ifndef MAC_OS_X_VERSION_10_7
#define MAC_OS_X_VERSION_10_7 1070
#endif
> +/* strnlen() is not available on Mac OS < 10.7 */
> +# if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
Does this cover the case where MAC_OS_X_VERSION_MAX_ALLOWED is set to
<1070 on a 10.7+ build machine? It's possible that the <string.h>
header would define strnlen() and your code redefines the function
(compiler error).
It would be best to check how <string.h>, <Availability.h>, and
<AvailabilityMacros.h> work to make sure that all cases are handled. I
don't have access to a Mac right now, sorry.
Perhaps this approach works better:
# ifndef MAC_OS_X_VERSION_10_7
next prev parent reply other threads:[~2017-10-23 16:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-23 2:50 [Qemu-devel] [libfdt][PATCH v3] implement strnlen for systems that need it John Arbuckle
2017-10-23 16:09 ` Stefan Hajnoczi [this message]
2017-10-23 16:27 ` Peter Maydell
2017-10-24 3:45 ` Programmingkid
2017-10-24 6:52 ` Peter Maydell
2017-10-24 12:18 ` Stefan Hajnoczi
2017-10-25 16:18 ` Programmingkid
2017-10-24 3:13 ` Programmingkid
2017-10-24 12:09 ` Stefan Hajnoczi
2017-10-24 13:37 ` Programmingkid
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=20171023160959.GC10220@stefanha-x1.localdomain \
--to=stefanha@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=devicetree-compiler@vger.kernel.org \
--cc=ian@freebsd.org \
--cc=peter.maydell@linaro.org \
--cc=programmingkidx@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.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 NNTP newsgroup(s).