1.1 --- a/tools/libxc/xc_dom.h	Fri Feb 09 14:43:21 2007 -0600
     1.2 +++ b/tools/libxc/xc_dom.h	Fri Feb 09 14:43:22 2007 -0600
     1.3 @@ -7,11 +7,6 @@
     1.4  typedef uint64_t xen_vaddr_t;
     1.5  typedef uint64_t xen_paddr_t;
     1.6  
     1.7 -/* FIXME: temporary hack ... */
     1.8 -#ifndef PRIpfn
     1.9 -#define PRIpfn "lx"
    1.10 -#endif
    1.11 -
    1.12  struct xc_dom_seg {
    1.13      xen_vaddr_t vstart;
    1.14      xen_vaddr_t vend;

     2.1 --- a/xen/include/public/arch-ia64.h	Fri Feb 09 14:43:21 2007 -0600
     2.2 +++ b/xen/include/public/arch-ia64.h	Fri Feb 09 14:43:22 2007 -0600
     2.3 @@ -55,6 +55,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
     2.4  
     2.5  typedef unsigned long xen_pfn_t;
     2.6  DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     2.7 +#define PRIpfn "lx"
     2.8  #endif
     2.9  
    2.10  /* Arch specific VIRQs definition */

     3.1 --- a/xen/include/public/arch-powerpc.h	Fri Feb 09 14:43:21 2007 -0600
     3.2 +++ b/xen/include/public/arch-powerpc.h	Fri Feb 09 14:43:22 2007 -0600
     3.3 @@ -56,6 +56,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
     3.4  
     3.5  typedef unsigned long long xen_pfn_t;
     3.6  DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     3.7 +#define PRIpfn "llx"
     3.8  #endif
     3.9  
    3.10  /*

     4.1 --- a/xen/include/public/arch-x86/xen.h	Fri Feb 09 14:43:21 2007 -0600
     4.2 +++ b/xen/include/public/arch-x86/xen.h	Fri Feb 09 14:43:22 2007 -0600
     4.3 @@ -61,6 +61,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
     4.4  
     4.5  typedef unsigned long xen_pfn_t;
     4.6  DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     4.7 +#define PRIpfn "lx"
     4.8  #endif
     4.9  
    4.10  /*