From 9d9ecaca74854de7b6e075957a07cd6fe19aa443 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 25 Mar 2011 02:05:32 +0000 Subject: [PATCH] revert last change, disable warnings; this will keep us from having to make any additional modifications to atombios git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41100 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/radeon_hd/atombios/Decoder.c | 6 +++--- src/add-ons/accelerants/radeon_hd/atombios/Jamfile | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c b/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c index fbb965d554..95908d5fe6 100644 --- a/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c +++ b/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c @@ -50,7 +50,7 @@ Revision History: extern COMMANDS_PROPERTIES CallTable[]; -static UINT8 ProcessCommandProperties(PARSER_TEMP_DATA STACK_BASED * pParserTempData) +UINT8 ProcessCommandProperties(PARSER_TEMP_DATA STACK_BASED * pParserTempData) { UINT8 opcode=((COMMAND_HEADER*)pParserTempData->pWorkingTableData->IP)->Opcode; pParserTempData->pWorkingTableData->IP+=CallTable[opcode].headersize; @@ -85,7 +85,7 @@ UINT16* GetCommandMasterTablePointer(DEVICE_DATA STACK_BASED* pDeviceData) return MasterTableOffset; } -static UINT16* GetDataMasterTablePointer(DEVICE_DATA STACK_BASED* pDeviceData) +UINT16* GetDataMasterTablePointer(DEVICE_DATA STACK_BASED* pDeviceData) { UINT16 *MasterTableOffset; @@ -100,7 +100,7 @@ static UINT16* GetDataMasterTablePointer(DEVICE_DATA STACK_BASED* pDeviceData) } -static UINT8 GetTrueIndexInMasterTable(PARSER_TEMP_DATA STACK_BASED * pParserTempData, UINT8 IndexInMasterTable) +UINT8 GetTrueIndexInMasterTable(PARSER_TEMP_DATA STACK_BASED * pParserTempData, UINT8 IndexInMasterTable) { #ifndef DISABLE_EASF UINT16 i; diff --git a/src/add-ons/accelerants/radeon_hd/atombios/Jamfile b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile index ed131becff..ed3994a0b1 100644 --- a/src/add-ons/accelerants/radeon_hd/atombios/Jamfile +++ b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile @@ -7,6 +7,11 @@ UsePrivateHeaders [ FDirName graphics common ] ; DEFINES += DISABLE_EASF ; +# To avoid changing AMD vendor sources +TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) + : -Wall -Wmissing-prototypes -Wcast-align ] ; +TARGET_WARNING_CCFLAGS += -Wno-pointer-to-int-cast ; + StaticLibrary atombios.a : Decoder.c CD_Operations.c