diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-18 17:08:09 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-18 17:08:09 +0100 |
| commit | 2db40abe9933c27ffbbc04d0fa9c9f38e795d973 (patch) | |
| tree | f343d0ec6da209182f8d42a68c25a059af923db3 /xen | |
| parent | ea847a59dc7db35e48d15faf01ca81ba982675c8 (diff) | |
| download | xen-2db40abe9933c27ffbbc04d0fa9c9f38e795d973.tar.gz xen-2db40abe9933c27ffbbc04d0fa9c9f38e795d973.tar.bz2 xen-2db40abe9933c27ffbbc04d0fa9c9f38e795d973.zip | |
[OpenBSD] Various changes to get Xen building on OpenBSD.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/Rules.mk | 2 | ||||
| -rw-r--r-- | xen/common/vsprintf.c | 2 | ||||
| -rw-r--r-- | xen/drivers/char/console.c | 2 | ||||
| -rw-r--r-- | xen/include/xen/lib.h | 2 | ||||
| -rw-r--r-- | xen/include/xen/stdarg.h | 5 |
5 files changed, 9 insertions, 4 deletions
diff --git a/xen/Rules.mk b/xen/Rules.mk index d333e563ce..08c26aca44 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -72,7 +72,7 @@ AFLAGS := $(strip $(AFLAGS) $(AFLAGS-y)) AFLAGS += $(patsubst -std=gnu%,,$(CFLAGS)) # LDFLAGS are only passed directly to $(LD) -LDFLAGS += $(LDFLAGS_DIRECT) +LDFLAGS := $(strip $(LDFLAGS) $(LDFLAGS_DIRECT)) include Makefile diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index da82029195..7de43593fe 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -16,7 +16,7 @@ * - scnprintf and vscnprintf */ -#include <stdarg.h> +#include <xen/stdarg.h> #include <xen/ctype.h> #include <xen/lib.h> #include <asm/div64.h> diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index b43f8eafc7..78034b2753 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -6,7 +6,7 @@ * Copyright (c) 2002-2004, K A Fraser. */ -#include <stdarg.h> +#include <xen/stdarg.h> #include <xen/config.h> #include <xen/version.h> #include <xen/init.h> diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 00bb0830e9..52509addd4 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -2,7 +2,7 @@ #define __LIB_H__ #include <xen/inttypes.h> -#include <stdarg.h> +#include <xen/stdarg.h> #include <xen/config.h> #include <xen/types.h> #include <xen/xmalloc.h> diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h new file mode 100644 index 0000000000..a9bdaca256 --- /dev/null +++ b/xen/include/xen/stdarg.h @@ -0,0 +1,5 @@ +#if defined(__OpenBSD__) || defined(__sun__) +# include "/usr/include/stdarg.h" +#else +# include <stdarg.h> +#endif |