diff -r 41b2c4e4f674 xen/include/public/arch-x86/xen.h
--- a/xen/include/public/arch-x86/xen.h	Wed Jul 29 09:20:46 2009 +0100
+++ b/xen/include/public/arch-x86/xen.h	Thu Jul 30 11:08:01 2009 +0200
@@ -44,9 +44,13 @@
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define __XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
 #define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)
+
+#if __XEN_INTERFACE_VERSION__ >= 0x00030201
 #define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
-#ifdef __XEN_TOOLS__
 #define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
+#else
+#define set_xen_guest_handle(hnd, val)  (hnd) = val
+#define get_xen_guest_handle(val, hnd)  val = (hnd)
 #endif
 
 #if defined(__i386__)