diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-02-07 12:13:24 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-02-07 12:13:24 +0000 |
| commit | 26f91ef506f5c0f63a399d84624142f318c4f048 (patch) | |
| tree | e13e26d0c176166b77360e79fe45e4aa7cfaa06e /extras | |
| parent | 00cee37d3759218c28856d092713b44633fde1f3 (diff) | |
| download | xen-26f91ef506f5c0f63a399d84624142f318c4f048.tar.gz xen-26f91ef506f5c0f63a399d84624142f318c4f048.tar.bz2 xen-26f91ef506f5c0f63a399d84624142f318c4f048.zip | |
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@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/include/x86/os.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 6bd0ebee99..f193865cd2 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -164,6 +164,7 @@ typedef struct { volatile int counter; } atomic_t; /************************** 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(unsigned long word) #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]; }; |