/[gentoo-x86]/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
Gentoo

Contents of /x11-base/xorg-server/files/1.3-alpha-build-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Sep 28 07:41:03 2009 UTC (4 years, 9 months ago) by remi
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
x11-base/xorg-server: drop old ebuilds, prune ${FILESDIR}
(Portage version: 2.2_rc42/cvs/Linux i686)

1 commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200
2 Author: Julien Cristau <jcristau@debian.org>
3 Date: Thu Jul 19 20:37:26 2007 -0400
4
5 Fix alpha build failures
6
7 Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
8 <unistd.h> instead
9
10 diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
11 index 5aca9e9..085c942 100644
12 --- a/hw/xfree86/os-support/linux/lnx.h
13 +++ b/hw/xfree86/os-support/linux/lnx.h
14 @@ -11,7 +11,6 @@ extern int iopl __P ((int __level));
15
16 /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
17 # include <linux/unistd.h>
18 -# include <asm/pci.h>
19 extern long (*_iobase)(unsigned, int, int, int);
20
21 /*
22 diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
23 index 0a76129..e255118 100644
24 --- a/hw/xfree86/os-support/linux/lnx_axp.c
25 +++ b/hw/xfree86/os-support/linux/lnx_axp.c
26 @@ -112,8 +112,8 @@ lnxGetAXP(void)
27 /*
28 * pciconfig_iobase wrappers and dynamic i/o selection
29 */
30 -#include <linux/unistd.h>
31 -#include <asm/pci.h>
32 +#include "lnx.h"
33 +#include <unistd.h>
34 #include <errno.h>
35
36 /* glibc versions (single hose only) */

  ViewVC Help
Powered by ViewVC 1.1.20