From: Tim Deegan <tim@xen.org>
To: xen-devel@lists.xen.org
Cc: keir@xen.org, ian.campbell@citrix.com, chegger@amazon.de,
Ian.Jackson@eu.citrix.com, prlw1@cam.ac.uk,
stefano.stabellini@citrix.com, jbeulich@suse.com
Subject: [PATCH 3/3] xen: Add stdbool.h workaround for BSD.
Date: Thu, 15 Aug 2013 14:25:07 +0100 [thread overview]
Message-ID: <1376573107-27249-4-git-send-email-tim@xen.org> (raw)
In-Reply-To: <1376573107-27249-1-git-send-email-tim@xen.org>
On *BSD, stdbool.h lives in /usr/include, but we don't want to have
that on the search path in case we pick up any headers from the build
host's C libraries.
Copy the equivalent hack already in place for stdarg.h: on all
supported compilers the contents of stdbool.h are trivial, so just
supply the things we need in a xen/stdbool.h header.
Signed-off-by: Tim Deegan <tim@xen.org>
---
xen/include/xen/libelf.h | 4 ++--
xen/include/xen/stdbool.h | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 xen/include/xen/stdbool.h
diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h
index e65db6d..6393040 100644
--- a/xen/include/xen/libelf.h
+++ b/xen/include/xen/libelf.h
@@ -29,8 +29,6 @@
#error define architectural endianness
#endif
-#include <stdbool.h>
-
typedef int elf_errorstatus; /* 0: ok; -ve (normally -1): error */
typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */
@@ -39,12 +37,14 @@ typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */
#ifdef __XEN__
#include <public/elfnote.h>
#include <public/features.h>
+#include <xen/stdbool.h>
#include <xen/string.h>
#else
#include <xen/elfnote.h>
#include <xen/features.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <string.h>
struct elf_binary;
diff --git a/xen/include/xen/stdbool.h b/xen/include/xen/stdbool.h
new file mode 100644
index 0000000..2eecd52
--- /dev/null
+++ b/xen/include/xen/stdbool.h
@@ -0,0 +1,13 @@
+#ifndef __XEN_STDBOOL_H__
+#define __XEN_STDBOOL_H__
+
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+# define bool _Bool
+# define true 1
+# define false 0
+# define __bool_true_false_are_defined 1
+#else
+# include <stdbool.h>
+#endif
+
+#endif /* __XEN_STDBOOL_H__ */
--
1.7.10.4
next prev parent reply other threads:[~2013-08-15 13:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 13:25 [PATCH 0/3] stdinc-related build fixes Tim Deegan
2013-08-15 13:25 ` [PATCH 1/3] xen: move some arch CFLAGS into the common Rules.mk Tim Deegan
2013-08-15 14:11 ` Ian Campbell
2013-08-15 13:25 ` [PATCH 2/3] xen: move -nostdinc into " Tim Deegan
2013-08-15 14:12 ` Ian Campbell
2013-08-15 13:25 ` Tim Deegan [this message]
2013-08-15 14:15 ` [PATCH 3/3] xen: Add stdbool.h workaround for BSD Ian Campbell
2013-08-19 13:48 ` Ian Jackson
2013-08-19 14:16 ` Tim Deegan
2013-08-19 16:48 ` Ian Jackson
2013-08-15 13:51 ` [PATCH 0/3] stdinc-related build fixes Jan Beulich
2013-08-15 15:26 ` Keir Fraser
2013-08-15 15:55 ` Solaris / FreeBSD builds (was Re: [PATCH 0/3] stdinc-related build fixes.) Tim Deegan
2013-08-15 19:49 ` [PATCH 0/3] stdinc-related build fixes Patrick Welche
2013-08-15 19:58 ` Andrew Cooper
2013-08-15 21:05 ` Patrick Welche
2013-08-15 21:15 ` Tim Deegan
2013-08-16 7:17 ` clang compilation Patrick Welche
2013-08-16 8:17 ` Tim Deegan
2013-08-16 8:48 ` Jan Beulich
2013-08-16 8:54 ` Tim Deegan
2013-08-16 9:27 ` Jan Beulich
2013-08-16 10:00 ` Jan Beulich
2013-08-16 8:23 ` [PATCH 0/3] stdinc-related build fixes Jan Beulich
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=1376573107-27249-4-git-send-email-tim@xen.org \
--to=tim@xen.org \
--cc=Ian.Jackson@eu.citrix.com \
--cc=chegger@amazon.de \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=prlw1@cam.ac.uk \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.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).