Index: cpu-all.h
===================================================================
RCS file: /sources/qemu/qemu/cpu-all.h,v
retrieving revision 1.74
diff -u -r1.74 cpu-all.h
--- cpu-all.h	29 Jul 2007 17:57:24 -0000	1.74
+++ cpu-all.h	19 Aug 2007 01:31:30 -0000
@@ -416,7 +416,7 @@
 {
     uint32_t a,b;
     a = ldl_be_p(ptr);
-    b = ldl_be_p(ptr+4);
+    b = ldl_be_p((char*)ptr+4);
     return (((uint64_t)a<<32)|b);
 }
 
@@ -453,7 +453,7 @@
 static inline void stq_be_p(void *ptr, uint64_t v)
 {
     stl_be_p(ptr, v >> 32);
-    stl_be_p(ptr + 4, v);
+    stl_be_p((char*)ptr + 4, v);
 }
 
 /* float access */
@@ -482,7 +482,7 @@
 {
     CPU_DoubleU u;
     u.l.upper = ldl_be_p(ptr);
-    u.l.lower = ldl_be_p(ptr + 4);
+    u.l.lower = ldl_be_p((char*)ptr + 4);
     return u.d;
 }
 
@@ -491,7 +491,7 @@
     CPU_DoubleU u;
     u.d = v;
     stl_be_p(ptr, u.l.upper);
-    stl_be_p(ptr + 4, u.l.lower);
+    stl_be_p((char*)ptr + 4, u.l.lower);
 }
 
 #else
Index: audio/audio.h
===================================================================
RCS file: /sources/qemu/qemu/audio/audio.h,v
retrieving revision 1.9
diff -u -r1.9 audio.h
--- audio/audio.h	17 Feb 2007 22:19:29 -0000	1.9
+++ audio/audio.h	19 Aug 2007 01:31:31 -0000
@@ -144,7 +144,7 @@
 
 static inline void *advance (void *p, int incr)
 {
-    uint8_t *d = p;
+    uint8_t *d = (uint8_t*)p;
     return (d + incr);
 }