Export PRI_xen_pfn rather than PRIpfn: less polluting of namespace.

libxc continues to use PRIpfn internally, #defined to PRI_xen_pfn.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
index 98f8f11d7f137824f1637474c265924a41aedcea..931d96acaf6e41b0b4774b8a42bca9d11c991f2f 100644 (file)
--- a/tools/libxc/xc_dom.h
+++ b/tools/libxc/xc_dom.h
@@ -7,6 +7,8 @@
 typedef uint64_t xen_vaddr_t;
 typedef uint64_t xen_paddr_t;
 
+#define PRIpfn PRI_xen_pfn
+
 struct xc_dom_seg {
     xen_vaddr_t vstart;
     xen_vaddr_t vend;

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index b4dfea62855127fc509aec66832c526b44373db4..8c6aaed3569d0e87824d30060b8c8c1458f5e197 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -57,7 +57,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
-#define PRIpfn "lx"
+#define PRI_xen_pfn "lx"
 #endif
 
 /* Arch specific VIRQs definition */

diff --git a/xen/include/public/arch-powerpc.h b/xen/include/public/arch-powerpc.h
index a6280745a3a63fb8d5679bd010499fe6c7607b7b..3f6b9930508ae8f90e2576b445aa809453141417 100644 (file)
--- a/xen/include/public/arch-powerpc.h
+++ b/xen/include/public/arch-powerpc.h
@@ -56,7 +56,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
-#define PRIpfn "llx"
+#define PRI_xen_pfn "llx"
 #endif
 
 /*

diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index 8053262672c4874902ed5e104110755b65c8a59f..22fcd69a65855747e1140f3cd7cb4e5b4fb963c8 100644 (file)
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -61,7 +61,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
-#define PRIpfn "lx"
+#define PRI_xen_pfn "lx"
 #endif
 
 /*