[Xen-changelog] Avoid repeated #define's in public headers.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID fc4e10d0455a83c57d6667dda4442198322f5e67
# Parent  2b6c1a8098078f7e53de7cf72227fddf01f0b2b6

Avoid repeated #define's in public headers.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 2b6c1a809807 -r fc4e10d0455a xen/include/public/io/domain_controller.h
--- a/xen/include/public/io/domain_controller.h Sat Jul  2 08:41:48 2005
+++ b/xen/include/public/io/domain_controller.h Sat Jul  2 22:37:55 2005
@@ -87,10 +87,10 @@
 #define CMSG_BLKIF_FE_INTERFACE_DISCONNECT      34
 #define CMSG_BLKIF_FE_INTERFACE_QUERY           35
 
-/* These are used by both front-end and back-end drivers. */
+#ifndef blkif_vdev_t
 #define blkif_vdev_t   u16
+#endif
 #define blkif_pdev_t   u32
-#define blkif_sector_t u64
 
 /*
  * CMSG_BLKIF_FE_INTERFACE_STATUS:
diff -r 2b6c1a809807 -r fc4e10d0455a xen/include/public/io/blkif.h
--- a/xen/include/public/io/blkif.h     Sat Jul  2 08:41:48 2005
+++ b/xen/include/public/io/blkif.h     Sat Jul  2 22:37:55 2005
@@ -11,7 +11,9 @@
 
 #include "ring.h"
 
+#ifndef blkif_vdev_t
 #define blkif_vdev_t   u16
+#endif
 #define blkif_sector_t u64
 
 #define BLKIF_OP_READ      0

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