diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-03-16 02:16:43 -0300 |
|---|---|---|
| committer | Y.C. Chen <yc_chen@aspeedtech.com> | 2008-03-18 18:54:03 +0800 |
| commit | 33cc790b35f2ad19ea68867d6a089f7b827f8334 (patch) | |
| tree | 4158a54142d945e599bf98088a6c8dc7c09c78a4 | |
| parent | 88944bd72555056c10dfcf87eb1a98c9ecf704bc (diff) | |
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.
Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com>
| -rw-r--r-- | src/ast_2dtool.c | 2 | ||||
| -rw-r--r-- | src/ast_pcirename.h | 2 | ||||
| -rw-r--r-- | 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; |