From 3b4fb87e25a6dfef68713b6c9abf0325655cd0c6 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 24 Dec 2005 14:51:49 +0000 Subject: [PATCH] Stefan Fiedler: xorg: fix gcc40 error "static declaration follows non-static declaration" by making the first declaration static; this might solve problems with static linking Index: package/x11/xorg/gcc40.patch =================================================================== [2005111720270113740] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6745 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xorg/gcc40.patch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/x11/xorg/gcc40.patch b/package/x11/xorg/gcc40.patch index 80b7f6c5a..59b7ddd5f 100644 --- a/package/x11/xorg/gcc40.patch +++ b/package/x11/xorg/gcc40.patch @@ -52,12 +52,14 @@ diff -dur xc/programs/Xserver/fb/fbmmx.c src.xorg.1129808283.2035.3041395841/xc/ else return v; } -diff -dur xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h ---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h 2004-08-12 04:23:46.000000000 +0200 -+++ src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h 2005-10-20 19:58:39.000000000 +0200 -@@ -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)" }, +--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h~ 2004-08-03 11:38:03.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-11-17 12:22:21.000000000 +0100 +@@ -146,7 +146,7 @@ + extern Bool RADEONProbe + FunctionPrototype((DriverPtr, int)); + +-extern SymTabRec RADEONChipsets[]; ++static SymTabRec RADEONChipsets[]; + extern PciChipsets RADEONPciChipsets[]; + + /* radeon_driver.c */