[Xen-changelog] [xen-unstable] Export PRI_xen_pfn rather than PRIpfn: less polluting of namespace.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1171480661 0
# Node ID f8030a56981185361c523c8261b639a711ee064b
# Parent  9af0c7e4ff513c02f9bd1548f21612e9cf59b022
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@xxxxxxxxxxxxx>
---
 tools/libxc/xc_dom.h              |    2 ++
 xen/include/public/arch-ia64.h    |    2 +-
 xen/include/public/arch-powerpc.h |    2 +-
 xen/include/public/arch-x86/xen.h |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff -r 9af0c7e4ff51 -r f8030a569811 tools/libxc/xc_dom.h
--- a/tools/libxc/xc_dom.h      Wed Feb 14 19:01:35 2007 +0000
+++ b/tools/libxc/xc_dom.h      Wed Feb 14 19:17:41 2007 +0000
@@ -6,6 +6,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;
diff -r 9af0c7e4ff51 -r f8030a569811 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Wed Feb 14 19:01:35 2007 +0000
+++ b/xen/include/public/arch-ia64.h    Wed Feb 14 19:17:41 2007 +0000
@@ -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 -r 9af0c7e4ff51 -r f8030a569811 xen/include/public/arch-powerpc.h
--- a/xen/include/public/arch-powerpc.h Wed Feb 14 19:01:35 2007 +0000
+++ b/xen/include/public/arch-powerpc.h Wed Feb 14 19:17:41 2007 +0000
@@ -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 -r 9af0c7e4ff51 -r f8030a569811 xen/include/public/arch-x86/xen.h
--- a/xen/include/public/arch-x86/xen.h Wed Feb 14 19:01:35 2007 +0000
+++ b/xen/include/public/arch-x86/xen.h Wed Feb 14 19:17:41 2007 +0000
@@ -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
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog