f4706b0
--- xen-4.0.1/tools/blktap/lib/blktaplib.h.orig	2010-08-25 11:22:07.000000000 +0100
f4706b0
+++ xen-4.0.1/tools/blktap/lib/blktaplib.h	2010-08-29 20:57:11.000000000 +0100
f4706b0
@@ -195,8 +195,10 @@
f4706b0
 	pid_t     pid;
f4706b0
 } msg_pid_t;
f4706b0
 
f4706b0
+#ifndef READ
f4706b0
 #define READ 0
f4706b0
 #define WRITE 1
f4706b0
+#endif
f4706b0
f4706b0
 /*Control Messages between manager and tapdev*/
f4706b0
 #define CTLMSG_PARAMS      1
f4706b0
--- xen-4.0.1/tools/blktap2/include/blktaplib.h.orig	2010-08-25 11:22:07.000000000 +0100
f4706b0
+++ xen-4.0.1/tools/blktap2/include/blktaplib.h	2010-08-29 21:50:50.000000000 +0100
f4706b0
@@ -197,8 +197,10 @@
f4706b0
 	int       uuid_len;
f4706b0
 } msg_lock_t;
f4706b0
 
f4706b0
+#ifndef READ
f4706b0
 #define READ 0
f4706b0
 #define WRITE 1
f4706b0
+#endif
f4706b0
 
f4706b0
 /*Control Messages between manager and tapdev*/
f4706b0
 #define CTLMSG_PARAMS          1