From bcfecbd9acd25d965a3289f5037f7f72ab0fb8a0 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Sun, 16 Mar 2008 02:16:43 -0300 Subject: [PATCH] Compile warning fixes. Declare ulGetCMDQLength as static, and don't declare a variable if XSERVER_LIBPCIACCESS is defined. There is a lot of prototypes defined in some c files, that would be better to be moved to the appropriate header, to make sure definition matches prototype, but not done for now. --- src/ast_2dtool.c | 2 +- src/ast_pcirename.h | 2 +- src/ast_tool.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c index afbac7c..a8b5838 100644 --- a/src/ast_2dtool.c +++ b/src/ast_2dtool.c @@ -254,7 +254,7 @@ Exit_vWaitEngIdle: } /* ULONG ulGetCMDQLength() */ -__inline ULONG ulGetCMDQLength(ASTRecPtr pAST, ULONG ulWritePointer, ULONG ulCMDQMask) +static __inline ULONG ulGetCMDQLength(ASTRecPtr pAST, ULONG ulWritePointer, ULONG ulCMDQMask) { ULONG ulReadPointer, ulReadPointer2; diff --git a/src/ast_pcirename.h b/src/ast_pcirename.h index cbd3dcf..f5085bd 100644 --- a/src/ast_pcirename.h +++ b/src/ast_pcirename.h @@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr; #endif /* XSERVER_LIBPCIACCESS */ -#endif /* CIRPCIRENAME_H */ +#endif /* ASTPCIRENAME_H */ diff --git a/src/ast_tool.c b/src/ast_tool.c index 11d3085..157a869 100644 --- a/src/ast_tool.c +++ b/src/ast_tool.c @@ -112,10 +112,9 @@ ASTUnmapMem(ScrnInfoPtr pScrn) Bool ASTMapMMIO(ScrnInfoPtr pScrn) { - int mmioFlags; ASTRecPtr pAST = ASTPTR(pScrn); - #ifndef XSERVER_LIBPCIACCESS + int mmioFlags; #if !defined(__alpha__) mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT; -- 1.5.3.2