From 732ee2945e8e32299bfe024ffc2f3503aca5c0c0 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Sat, 15 Mar 2008 21:57:46 -0300 Subject: [PATCH] Compile warning fix. Don't redeclare variable err; cut&paste error that caused warning about mixed code and declarations. Minor consistency change to neo_pcirename.h. --- src/neo_driver.c | 2 +- src/neo_pcirename.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/neo_driver.c b/src/neo_driver.c index fec51ce..c54ba20 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -2087,7 +2087,7 @@ neoMapMem(ScrnInfoPtr pScrn) if (nPtr->NeoMMIOAddr2 != 0){ result = (void**)&nPtr->NeoMMIOBase2; - int err = pci_device_map_range(nPtr->PciInfo, + err = pci_device_map_range(nPtr->PciInfo, nPtr->NeoMMIOAddr2, 0x100000L, PCI_DEV_MAP_FLAG_WRITABLE, diff --git a/src/neo_pcirename.h b/src/neo_pcirename.h index f0f5cf8..2492dc0 100644 --- a/src/neo_pcirename.h +++ b/src/neo_pcirename.h @@ -26,8 +26,8 @@ * library. The main purpose being to facilitate source code compatibility. */ -#ifndef CIRPCIRENAME_H -#define CIRPCIRENAME_H +#ifndef NEOPCIRENAME_H +#define NEOPCIRENAME_H enum region_type { REGION_MEM, @@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr; #endif /* XSERVER_LIBPCIACCESS */ -#endif /* CIRPCIRENAME_H */ +#endif /* NEOPCIRENAME_H */ -- 1.5.3.2