Ok try to work around the header abuse in a different way.

If this still fails, I guess I'll need to build 32bit Xen locally.

diff --git a/platform/xen/xen/include/mini-os/types.h b/platform/xen/xen/include/mini-os/types.h
index 06b09983403431effeec65e3cf988af4425d0f59..c08dcd756a881727ee180b2a7c4294ca5fb64313 100644 (file)
--- a/platform/xen/xen/include/mini-os/types.h
+++ b/platform/xen/xen/include/mini-os/types.h
@@ -21,13 +21,16 @@
 #define _MINIOS_TYPES_H_
 
 /* XXX: fix the kernelside Xen driver #include abuse */
-#ifndef __RUMP_KERNEL__
+
 #include <bmk-core/types.h>
 
+#ifndef _BSD_SIZE_T_
 typedef unsigned int           u_int;
 typedef unsigned long          u_long;
 typedef unsigned long          size_t;
+#endif
 
+#ifndef offsetof
 #define offsetof(_t_,_e_) __builtin_offsetof(_t_,_e_)
 #endif