rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.391, 1.392 xserver-1.5.99.3-broken-mtrr-header.patch, 1.2, 1.3

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17756

Modified Files:
	xorg-x11-server.spec xserver-1.5.99.3-broken-mtrr-header.patch 
Log Message:
- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- xorg-x11-server.spec	26 Jan 2009 17:14:12 -0000	1.391
+++ xorg-x11-server.spec	26 Jan 2009 18:21:19 -0000	1.392
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.901
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -492,6 +492,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-3
+- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again
+
 * Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2
 - rebuild against new openssl
 

xserver-1.5.99.3-broken-mtrr-header.patch:

Index: xserver-1.5.99.3-broken-mtrr-header.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.99.3-broken-mtrr-header.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.5.99.3-broken-mtrr-header.patch	8 Jan 2009 15:25:48 -0000	1.2
+++ xserver-1.5.99.3-broken-mtrr-header.patch	26 Jan 2009 18:21:19 -0000	1.3
@@ -16,8 +16,8 @@
  #include <unistd.h>
  #include <sys/mman.h>
  #ifdef HAVE_ASM_MTRR_H
-+typedef unsigned char u8;
-+typedef unsigned int u32;
++typedef unsigned char __u8;
++typedef unsigned int __u32;
  #include <asm/mtrr.h>
  #endif
  
@@ -29,8 +29,8 @@
  #endif
  
  #ifdef HAS_MTRR_SUPPORT
-+typedef unsigned char u8;
-+typedef unsigned int u32;
++typedef unsigned char __u8;
++typedef unsigned int __u32;
  #include <asm/mtrr.h>
  #endif