From: Paweł Sikora <pluto@pld-linux.org>
Date: Thu, 31 Mar 2005 12:32:58 +0000 (+0000)
Subject: - build fix:
X-Git-Tag: auto/ac/X11-6_8_2-5~6
X-Git-Url: https://git.pld-linux.org/?p=packages%2FX11.git;a=commitdiff_plain;h=b2bb7e95957b530c00e5e95448b8a5f6d9290a3e

- build fix:
  radeon_chipset.h:1: error: static declaration of 'RADEONChipsets' follows non-static declaration
  radeon_probe.h:149: error: previous declaration of 'RADEONChipsets' was here

Changed files:
    X11-gcc4.patch -> 1.6
---

diff --git a/X11-gcc4.patch b/X11-gcc4.patch
index a7af653..971a055 100644
--- a/X11-gcc4.patch
+++ b/X11-gcc4.patch
@@ -1,8 +1,8 @@
 
- config/cf/xorg.cf                                        |    2 +-
- programs/Xserver/fb/fbmmx.c                              |   13 +++++++------
- programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h |    2 +-
- 3 files changed, 9 insertions(+), 8 deletions(-)
+ config/cf/xorg.cf                                      |    2 +-
+ programs/Xserver/fb/fbmmx.c                            |   14 ++++++++------
+ programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h |    3 ---
+ 3 files changed, 9 insertions(+), 10 deletions(-)
 
 --- X11-6.8.2/xc/config/cf/xorg.cf.orig	2005-03-21 19:11:42.000000000 +0100
 +++ X11-6.8.2/xc/config/cf/xorg.cf	2005-03-21 23:03:46.000000000 +0100
@@ -53,11 +53,15 @@
      else
  	return v;
  }
---- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h.orig	2004-08-12 04:23:46.000000000 +0200
-+++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h	2005-02-15 11:00:00.350593552 +0100
-@@ -1,4 +1,4 @@
--static SymTabRec RADEONChipsets[] = {
-+SymTabRec RADEONChipsets[] = {
-     { PCI_CHIP_RADEON_QD, "ATI Radeon QD (AGP)" },
-     { PCI_CHIP_RADEON_QE, "ATI Radeon QE (AGP)" },
-     { PCI_CHIP_RADEON_QF, "ATI Radeon QF (AGP)" },
+--- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig	2004-08-03 11:38:03.000000000 +0200
++++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h	2005-03-31 14:20:45.000000000 +0200
+@@ -146,9 +146,6 @@
+ extern Bool                 RADEONProbe
+ 			    FunctionPrototype((DriverPtr, int));
+ 
+-extern SymTabRec            RADEONChipsets[];
+-extern PciChipsets          RADEONPciChipsets[];
+-
+ /* radeon_driver.c */
+ extern void                 RADEONLoaderRefSymLists
+ 			    FunctionPrototype((void));