[Xen-changelog] [xen-unstable] minios: do not export {test, set, clear}_bit etc to applications

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1297080804 0
# Node ID e44f3ab80d1428020b51abd9be4fa5d71b6c32bc
# Parent  77d05af7dc78c76d393b4bff8d93c0e42ee72ad4
minios: do not export {test,set,clear}_bit etc to applications

Fixes ioemu stubdom build:
CC    i386-stubdom/piix4acpi.o
[...]/stubdom/ioemu/hw/piix4acpi.c:272: error: expected ')' before '?' token
[...]/stubdom/ioemu/hw/piix4acpi.c:277: error: conflicting types for 'set_bit'
[...]/stubdom/../extras/mini-os/include/x86/mini-os/os.h:396: error: previous 
definition of 'set_bit' was here
[...]/stubdom/ioemu/hw/piix4acpi.c:282: error: conflicting types for 'clear_bit'
[...]/stubdom/../extras/mini-os/include/x86/mini-os/os.h:414: error: previous 
definition of 'clear_bit' was here
[...]/stubdom/ioemu/hw/piix4acpi.c: In function 'gpe_sts_write':

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 extras/mini-os/include/x86/os.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 77d05af7dc78 -r e44f3ab80d14 extras/mini-os/include/x86/os.h
--- a/extras/mini-os/include/x86/os.h   Mon Feb 07 09:58:11 2011 +0000
+++ b/extras/mini-os/include/x86/os.h   Mon Feb 07 12:13:24 2011 +0000
@@ -164,6 +164,7 @@ typedef struct { volatile int counter; }
 
 
 /************************** i386 *******************************/
+#ifdef __INSIDE_MINIOS__
 #if defined (__i386__)
 
 #define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned 
long)(v),(ptr),sizeof(*(ptr))))
@@ -451,7 +452,7 @@ static __inline__ unsigned long __ffs(un
 #else /* ifdef __x86_64__ */
 #error "Unsupported architecture"
 #endif
-
+#endif /* ifdef __INSIDE_MINIOS */
 
 /********************* common i386 and x86_64  ****************************/
 struct __synch_xchg_dummy { unsigned long a[100]; };

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