summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ast_2dtool.c2
-rw-r--r--src/ast_pcirename.h2
-rw-r--r--src/ast_tool.c3
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;