* [PATCH] xenstore: Fix all builds
@ 2021-02-01 23:35 Andrew Cooper
2021-02-02 8:49 ` Jan Beulich
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andrew Cooper @ 2021-02-01 23:35 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper, Roger Pau Monné, Ian Jackson
This diff is easier viewed through `cat -A`
diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$
index 1bd443f61a..f7e4da2b2c 100644$
--- a/tools/xenstore/include/xenstore_state.h$
+++ b/tools/xenstore/include/xenstore_state.h$
@@ -21,7 +21,7 @@$
#ifndef XENSTORE_STATE_H$
#define XENSTORE_STATE_H$
$
-#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$
+#if defined(__FreeBSD__) || defined(__NetBSD__)$
#include <sys/endian.h>$
#else$
#include <endian.h>$
A non-breaking space isn't a valid C preprocessor token.
Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Ian Jackson <iwj@xenproject.org>
---
tools/xenstore/include/xenstore_state.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h
index 1bd443f61a..f7e4da2b2c 100644
--- a/tools/xenstore/include/xenstore_state.h
+++ b/tools/xenstore/include/xenstore_state.h
@@ -21,7 +21,7 @@
#ifndef XENSTORE_STATE_H
#define XENSTORE_STATE_H
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/endian.h>
#else
#include <endian.h>
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] xenstore: Fix all builds
2021-02-01 23:35 [PATCH] xenstore: Fix all builds Andrew Cooper
@ 2021-02-02 8:49 ` Jan Beulich
2021-02-02 9:19 ` Roger Pau Monné
2021-02-02 11:21 ` Ian Jackson
2 siblings, 0 replies; 4+ messages in thread
From: Jan Beulich @ 2021-02-02 8:49 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Roger Pau Monné, Ian Jackson, Xen-devel
On 02.02.2021 00:35, Andrew Cooper wrote:
> This diff is easier viewed through `cat -A`
>
> diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$
> index 1bd443f61a..f7e4da2b2c 100644$
> --- a/tools/xenstore/include/xenstore_state.h$
> +++ b/tools/xenstore/include/xenstore_state.h$
> @@ -21,7 +21,7 @@$
> #ifndef XENSTORE_STATE_H$
> #define XENSTORE_STATE_H$
> $
> -#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$
> +#if defined(__FreeBSD__) || defined(__NetBSD__)$
> #include <sys/endian.h>$
> #else$
> #include <endian.h>$
>
> A non-breaking space isn't a valid C preprocessor token.
>
> Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
I wonder why you didn't throw this in right away, without
waiting for any acks.
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xenstore: Fix all builds
2021-02-01 23:35 [PATCH] xenstore: Fix all builds Andrew Cooper
2021-02-02 8:49 ` Jan Beulich
@ 2021-02-02 9:19 ` Roger Pau Monné
2021-02-02 11:21 ` Ian Jackson
2 siblings, 0 replies; 4+ messages in thread
From: Roger Pau Monné @ 2021-02-02 9:19 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Xen-devel, Ian Jackson
On Mon, Feb 01, 2021 at 11:35:13PM +0000, Andrew Cooper wrote:
> This diff is easier viewed through `cat -A`
>
> diff --git a/tools/xenstore/include/xenstore_state.h b/tools/xenstore/include/xenstore_state.h$
> index 1bd443f61a..f7e4da2b2c 100644$
> --- a/tools/xenstore/include/xenstore_state.h$
> +++ b/tools/xenstore/include/xenstore_state.h$
> @@ -21,7 +21,7 @@$
> #ifndef XENSTORE_STATE_H$
> #define XENSTORE_STATE_H$
> $
> -#if defined(__FreeBSD__) ||M-BM- defined(__NetBSD__)$
> +#if defined(__FreeBSD__) || defined(__NetBSD__)$
> #include <sys/endian.h>$
> #else$
> #include <endian.h>$
>
> A non-breaking space isn't a valid C preprocessor token.
>
> Fixes: ffbb8aa282de ("xenstore: fix build on {Net/Free}BSD")
Sorry. I fixed this locally but forgot to refresh the patch and ended
up sending the broken version. I need to figure a way to make
format-patch fail if there are uncommitted changes in the repository.
Thanks, Roger.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] xenstore: Fix all builds
2021-02-01 23:35 [PATCH] xenstore: Fix all builds Andrew Cooper
2021-02-02 8:49 ` Jan Beulich
2021-02-02 9:19 ` Roger Pau Monné
@ 2021-02-02 11:21 ` Ian Jackson
2 siblings, 0 replies; 4+ messages in thread
From: Ian Jackson @ 2021-02-02 11:21 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Xen-devel, Roger Pau Monné
Andrew Cooper writes ("[PATCH] xenstore: Fix all builds"):
> This diff is easier viewed through `cat -A`
...
> A non-breaking space isn't a valid C preprocessor token.
Yikes.
Thanks!
Ian.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-02 11:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 23:35 [PATCH] xenstore: Fix all builds Andrew Cooper
2021-02-02 8:49 ` Jan Beulich
2021-02-02 9:19 ` Roger Pau Monné
2021-02-02 11:21 ` Ian Jackson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.