- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again

This commit is contained in:
Adam Tkac 2009-01-26 18:21:19 +00:00
parent c0609f87da
commit 7068bb5990
2 changed files with 8 additions and 5 deletions

View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.5.99.901 Version: 1.5.99.901
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -492,6 +492,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2
- rebuild against new openssl - rebuild against new openssl

View File

@ -16,8 +16,8 @@ index 60e8ae1..537d740 100644
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef HAVE_ASM_MTRR_H #ifdef HAVE_ASM_MTRR_H
+typedef unsigned char u8; +typedef unsigned char __u8;
+typedef unsigned int u32; +typedef unsigned int __u32;
#include <asm/mtrr.h> #include <asm/mtrr.h>
#endif #endif
@ -29,8 +29,8 @@ index 688106a..535c3a0 100644
#endif #endif
#ifdef HAS_MTRR_SUPPORT #ifdef HAS_MTRR_SUPPORT
+typedef unsigned char u8; +typedef unsigned char __u8;
+typedef unsigned int u32; +typedef unsigned int __u32;
#include <asm/mtrr.h> #include <asm/mtrr.h>
#endif #endif