From d511ef486a15b582e5d1708a17a00701f5cf1ccd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 15 Jun 2006 20:39:22 +1000
Subject: ati/r128: add includes to get C function decls

Also fix a void pointer cast
---
 src/ati.h      | 1 +
 src/aticlock.c | 1 +
 src/atiprint.c | 1 +
 src/r128.h     | 1 +
 src/r128_dri.c | 3 ++-
 5 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/ati.h b/src/ati.h
index 4f87b03d..746177ef 100644
--- a/src/ati.h
+++ b/src/ati.h
@@ -24,6 +24,7 @@
 #ifndef ___ATI_H___
 #define ___ATI_H___ 1
 
+#include <unistd.h>
 #include "xf86Pci.h"
 #include "atipciids.h"
 
diff --git a/src/aticlock.c b/src/aticlock.c
index 5acd3f80..c0de5596 100644
--- a/src/aticlock.c
+++ b/src/aticlock.c
@@ -196,6 +196,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"
diff --git a/src/atiprint.c b/src/atiprint.c
index 365cffcb..d7851010 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <string.h>
+#include <ctype.h>
 
 #include "ati.h"
 #include "atiadapter.h"
diff --git a/src/r128.h b/src/r128.h
index eced5c7f..b37b3ce2 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -38,6 +38,7 @@
 #ifndef _R128_H_
 #define _R128_H_
 
+#include <unistd.h>
 #include "xf86str.h"
 
 				/* PCI support */
diff --git a/src/r128_dri.c b/src/r128_dri.c
index 5d7ac3ff..62e53a45 100644
--- a/src/r128_dri.c
+++ b/src/r128_dri.c
@@ -33,6 +33,7 @@
 #endif
 
 #include <string.h>
+#include <stdio.h>
 
 /*
  * Authors:
@@ -1036,7 +1037,7 @@ Bool R128DRIScreenInit(ScreenPtr pScreen)
     pDRIInfo->ddxDriverMajorVersion      = R128_VERSION_MAJOR;
     pDRIInfo->ddxDriverMinorVersion      = R128_VERSION_MINOR;
     pDRIInfo->ddxDriverPatchVersion      = R128_VERSION_PATCH;
-    pDRIInfo->frameBufferPhysicalAddress = info->LinearAddr;
+    pDRIInfo->frameBufferPhysicalAddress = (void *)info->LinearAddr;
     pDRIInfo->frameBufferSize            = info->FbMapSize;
     pDRIInfo->frameBufferStride          = (pScrn->displayWidth *
 					    info->CurrentLayout.pixel_bytes);
-- 
cgit v1.2.3