From 75beae6719839b188b716c2bfc07243d071e7e42 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Thu, 20 Mar 2008 23:49:05 -0300 Subject: [PATCH] Compile warning fixes. o Include unistd.h in i740.h to avoid warnings about missing usleep prototype. o Don't define a variable only if libpciaccess is not enabled. --- src/i740.h | 2 ++ src/i740_driver.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/i740.h b/src/i740.h index 12a5597..08e1431 100644 --- a/src/i740.h +++ b/src/i740.h @@ -46,6 +46,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "xaa.h" #include "xf86Cursor.h" +#include + /* Globals */ /* Memory mapped register access macros */ #define INREG8(addr) *(volatile CARD8 *)(pI740->MMIOBase + (addr)) diff --git a/src/i740_driver.c b/src/i740_driver.c index 8d66f22..4d02741 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -869,7 +869,9 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { static Bool I740MapMem(ScrnInfoPtr pScrn) { +#ifndef XSERVER_LIBPCIACCESS int mmioFlags; +#endif I740Ptr pI740; pI740 = I740PTR(pScrn); -- 1.5.3.2