| Message ID | 20210201233513.30923-1-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xenstore: Fix all builds | expand |
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
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.
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.
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>
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(-)