[xen] Fix compile problems in Fedora 15

[myoung]

commit f4706b05bb9393cf0fb6a781b47593904c97c40b
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Sun Aug 29 23:13:53 2010 +0100

    Fix compile problems in Fedora 15

 localgcc451fix.patch |   26 ++++++++++++++++++++++++++
 xen.spec             |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/localgcc451fix.patch b/localgcc451fix.patch
new file mode 100644
index 0000000..9b5bc16
--- /dev/null
+++ b/localgcc451fix.patch
@@ -0,0 +1,26 @@
+--- xen-4.0.1/tools/blktap/lib/blktaplib.h.orig	2010-08-25 11:22:07.000000000 +0100
++++ xen-4.0.1/tools/blktap/lib/blktaplib.h	2010-08-29 20:57:11.000000000 +0100
+@@ -195,8 +195,10 @@
+ 	pid_t     pid;
+ } msg_pid_t;
+ 
++#ifndef READ
+ #define READ 0
+ #define WRITE 1
++#endif
+
+ /*Control Messages between manager and tapdev*/
+ #define CTLMSG_PARAMS      1
+--- xen-4.0.1/tools/blktap2/include/blktaplib.h.orig	2010-08-25 11:22:07.000000000 +0100
++++ xen-4.0.1/tools/blktap2/include/blktaplib.h	2010-08-29 21:50:50.000000000 +0100
+@@ -197,8 +197,10 @@
+ 	int       uuid_len;
+ } msg_lock_t;
+ 
++#ifndef READ
+ #define READ 0
+ #define WRITE 1
++#endif
+ 
+ /*Control Messages between manager and tapdev*/
+ #define CTLMSG_PARAMS          1
diff --git a/xen.spec b/xen.spec
index 91371cb..ece061b 100644
--- a/xen.spec
+++ b/xen.spec
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -39,6 +39,7 @@ Patch10: xen-no-werror.patch
 
 Patch18: localgcc45fix.patch
 Patch19: localpy27fixes.patch
+Patch20: localgcc451fix.patch
 
 Patch100: xen-configure-xend.patch
 
@@ -162,6 +163,7 @@ to build the xen packages.
 
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %patch100 -p1
 
@@ -510,6 +512,9 @@ rm -rf %{buildroot}
 %doc licensedir/*
 
 %changelog
+* Sun Aug 29 2010 Michael Young <m.a.young at durham.ac.uk> - 4.0.1-2
+- fix compile problems on Fedora 15, I suspect due to gcc 4.5.1
+
 * Wed Aug 25 2010 Michael Young <m.a.young at durham.ac.uk> - 4.0.1-1
 - update to 4.0.1 release - many bug fixes
 - xen-dev-create-cleanup.patch no longer needed