xserver: Branch 'server-1.5-branch'

[Adam Jackson]

 hw/kdrive/vesa/vm86.h |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 992a7168f0db5733fe4a6cbd2f40c6b1f2a150e0
Author: Martin von Gagern <Martin.vGagern at gmx.net>
Date:   Wed Nov 5 11:44:03 2008 -0500

    Bug #17858: Fix Xvesa build on newer kernels.
    
    Not cherry picked from master, Xvesa is gone there.

diff --git a/hw/kdrive/vesa/vm86.h b/hw/kdrive/vesa/vm86.h
index 3b48814..8169308 100644
--- a/hw/kdrive/vesa/vm86.h
+++ b/hw/kdrive/vesa/vm86.h
@@ -67,6 +67,13 @@ static void ErrorF(char*, ...);
 #include "os.h"
 #endif
 
+#ifndef IF_MASK
+#define IF_MASK X86_EFLAGS_IF
+#endif
+#ifndef IOPL_MASK
+#define IOPL_MASK X86_EFLAGS_IOPL
+#endif
+
 typedef unsigned char	U8;
 typedef unsigned short	U16;
 typedef unsigned int	U32;