we still need the #ifdef __RUMP_KERNEL__ too

diff --git a/platform/xen/xen/include/mini-os/types.h b/platform/xen/xen/include/mini-os/types.h
index c08dcd756a881727ee180b2a7c4294ca5fb64313..52831d0c0a48553237382bf2867ac4d898fe1de7 100644 (file)
--- a/platform/xen/xen/include/mini-os/types.h
+++ b/platform/xen/xen/include/mini-os/types.h
@@ -21,7 +21,7 @@
 #define _MINIOS_TYPES_H_
 
 /* XXX: fix the kernelside Xen driver #include abuse */
-
+#ifndef __RUMP_KERNEL__
 #include <bmk-core/types.h>
 
 #ifndef _BSD_SIZE_T_
@@ -33,6 +33,7 @@ typedef unsigned long         size_t;
 #ifndef offsetof
 #define offsetof(_t_,_e_) __builtin_offsetof(_t_,_e_)
 #endif
+#endif
 
 #ifdef __i386__
 typedef struct { unsigned long pte_low, pte_high; } pte_t;