[Xen-changelog] [xen-unstable] [XEN] Forcibly undefine swap{16, 32, 64} in mkelf32 program.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 57635264b6c2ebf9d9d00d32333e6a91b8f7a80d
# Parent  20522afb261544d2c816a949699f4a3d54a92f46
[XEN] Forcibly undefine swap{16,32,64} in mkelf32 program.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/boot/mkelf32.c |    5 +++++
 1 files changed, 5 insertions(+)

diff -r 20522afb2615 -r 57635264b6c2 xen/arch/x86/boot/mkelf32.c
--- a/xen/arch/x86/boot/mkelf32.c       Wed Oct 18 19:23:32 2006 +0100
+++ b/xen/arch/x86/boot/mkelf32.c       Thu Oct 19 14:38:34 2006 +0100
@@ -90,6 +90,11 @@ static Elf32_Shdr out_shdr[] = {
     }
 };
 
+/* Some system header files define these macros and pollute our namespace. */
+#undef swap16
+#undef swap32
+#undef swap64
+
 #define swap16(_v) ((((u16)(_v)>>8)&0xff)|(((u16)(_v)&0xff)<<8))
 #define swap32(_v) (((u32)swap16((u16)(_v))<<16)|(u32)swap16((u32)((_v)>>16)))
 #define swap64(_v) (((u64)swap32((u32)(_v))<<32)|(u64)swap32((u32)((_v)>>32)))

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