Unwrap libc and fix a daft AVOID_CPIO dependant formatting warning.

16 files changed, 46 insertions, 1 deletions

diff --git a/src/ati.h b/src/ati.h
index f557853..8519027 100644
--- a/src/ati.h
+++ b/src/ati.h
@@ -29,7 +29,6 @@
 
 #include "xf86.h"
 
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #endif /* ___ATI_H___ */
diff --git a/src/atibus.c b/src/atibus.c
index 9fa4f7f..5ae8ebc 100644
--- a/src/atibus.c
+++ b/src/atibus.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atibus.h"
 #include "atichip.h"
 #include "atiio.h"
diff --git a/src/aticlock.c b/src/aticlock.c
index 880792d..bdb4957 100644
--- a/src/aticlock.c
+++ b/src/aticlock.c
@@ -197,6 +197,9 @@
 #endif
 
 #include "ati.h"
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "atichip.h"
 #include "atidac.h"
 #include "atidsp.h"
diff --git a/src/aticonfig.c b/src/aticonfig.c
index a4927d1..a2df762 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -29,6 +29,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atichip.h"
 #include "aticonfig.h"
 #include "aticursor.h"
diff --git a/src/atidac.c b/src/atidac.c
index 34b698c..811900a 100644
--- a/src/atidac.c
+++ b/src/atidac.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atidac.h"
 #include "atimach64io.h"
 #include "atimono.h"
diff --git a/src/atidga.c b/src/atidga.c
index 70245d3..8a623ef 100644
--- a/src/atidga.c
+++ b/src/atidga.c
@@ -27,6 +27,8 @@
 #ifndef AVOID_DGA
 
 #include "ati.h"
+#include <string.h>
+
 #include "atiadjust.h"
 #include "atichip.h"
 #include "atidac.h"
diff --git a/src/atidri.c b/src/atidri.c
index d76cad9..075f7d2 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -33,6 +33,10 @@
 
 /* Driver data structures */
 #include "ati.h"
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+
 #include "atibus.h"
 #include "atidri.h"
 #include "atiregs.h"
diff --git a/src/atimach64.c b/src/atimach64.c
index 055cf9b..856cfbf 100644
--- a/src/atimach64.c
+++ b/src/atimach64.c
@@ -54,6 +54,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atibus.h"
 #include "atichip.h"
 #include "atidac.h"
diff --git a/src/atimach64i2c.c b/src/atimach64i2c.c
index aeb51a3..2eced72 100644
--- a/src/atimach64i2c.c
+++ b/src/atimach64i2c.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "ati.h"
+#include <unistd.h>
+
 #include "atichip.h"
 #include "atii2c.h"
 #include "atimach64i2c.h"
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index eab6244..670ef83 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atiaccel.h"
 #include "atichip.h"
 #include "atimach64accel.h"
diff --git a/src/atimode.c b/src/atimode.c
index d61f97e..175db92 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -25,6 +25,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atichip.h"
 #include "atidac.h"
 #include "atidsp.h"
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 4453599..61af217 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -27,6 +27,12 @@
 #endif
 
 #include "ati.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+
 #include "atiadjust.h"
 #include "atiaudio.h"
 #include "atibus.h"
diff --git a/src/atiprint.c b/src/atiprint.c
index 4962d71..15fb8b3 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -26,6 +26,9 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+#include <ctype.h>
+
 #include "atichip.h"
 #include "atidac.h"
 #include "atimach64io.h"
@@ -516,7 +519,11 @@ ATIPrintRegisters
         {
             if (!(Index & 3))
                 xf86ErrorFVerb(4, "\n 0x%02X: ", Index);
+#ifdef AVOID_CPIO
             xf86ErrorFVerb(4, " %08lX", ATIMach64GetLCDReg(Index));
+#else
+            xf86ErrorFVerb(4, " %08X", ATIMach64GetLCDReg(Index));
+#endif
         }
 
         outr(LCD_INDEX, lcd_index);
@@ -528,7 +535,11 @@ ATIPrintRegisters
         {
             if (!(Index & 3))
                 xf86ErrorFVerb(4, "\n 0x%02X: ", Index);
+#ifdef AVOID_CPIO
             xf86ErrorFVerb(4, " %08lX", ATIMach64GetTVReg(Index));
+#else
+            xf86ErrorFVerb(4, " %08X", ATIMach64GetTVReg(Index));
+#endif
         }
 
         outr(TV_OUT_INDEX, tv_out_index);
diff --git a/src/atiscreen.c b/src/atiscreen.c
index f4b397c..a9e65ad 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -31,6 +31,8 @@
 #endif
 
 #include "ati.h"
+#include <string.h>
+
 #include "atibus.h"
 #include "atichip.h"
 #include "atiaccel.h"
diff --git a/src/ativga.c b/src/ativga.c
index aca08f4..42aa853 100644
--- a/src/ativga.c
+++ b/src/ativga.c
@@ -27,6 +27,8 @@
 #endif
 
 #include "ati.h"
+#include <unistd.h>
+
 #include "atichip.h"
 #include "atimono.h"
 #include "atistruct.h"
diff --git a/src/atividmem.c b/src/atividmem.c
index f2fb041..ba19459 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "ati.h"
+#include <unistd.h>
+
 #include "atistruct.h"
 #include "atividmem.h"