[Xen-changelog] [xen stable-4.1] xen: Add stdbool.h workaround for BSD.

[patchbot@xxxxxxx]

commit 4e4da361f57e1ced53cb65c53fc6289a345a3429
Author:     Tim Deegan <tim@xxxxxxx>
AuthorDate: Tue Aug 20 16:13:20 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Aug 20 16:13:20 2013 +0200

    xen: Add stdbool.h workaround for BSD.
    
    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@xxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
    Tested-by: Patrick Welche <prlw1@xxxxxxxxx>
    master commit: 7b9685ca4ed2fd723600ce66eb20a6d0c115b6cb
    master date: 2013-08-15 22:00:45 +0100
---
 xen/include/xen/libelf.h  |    4 ++--
 xen/include/xen/stdbool.h |   13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h
index 1da66f7..44e11d2 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,11 +37,13 @@ typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */
 #ifdef __XEN__
 #include <public/elfnote.h>
 #include <public/features.h>
+#include <xen/stdbool.h>
 #else
 #include <xen/elfnote.h>
 #include <xen/features.h>
 
 #include <stdarg.h>
+#include <stdbool.h>
 
 struct elf_binary;
 typedef void elf_log_callback(struct elf_binary*, void *caller_data,
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__ */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.1

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog