diff -ur qemu-0.6.0-orig/cpu-exec.c qemu-0.6.0/cpu-exec.c
--- qemu-0.6.0-orig/cpu-exec.c	2004-08-19 10:01:45.080895784 -0400
+++ qemu-0.6.0/cpu-exec.c	2004-08-19 10:01:34.672880432 -0400
@@ -903,7 +903,7 @@
 # define TRAP_sig(context)			EXCEPREG_sig(exception, context) /* number of powerpc exception taken */
 #endif /* __APPLE__ */
 
-int cpu_signal_handler(int host_signum, siginfo *info, 
+int cpu_signal_handler(int host_signum, struct siginfo *info, 
                        void *puc)
 {
     struct ucontext *uc = puc;
Only in qemu-0.6.0: .cvsignore
Only in qemu-0.6.0/linux-user: .path.c.swp
diff -ur qemu-0.6.0-orig/linux-user/syscall.c qemu-0.6.0/linux-user/syscall.c
--- qemu-0.6.0-orig/linux-user/syscall.c	2004-08-19 10:01:48.047976952 -0400
+++ qemu-0.6.0/linux-user/syscall.c	2004-08-19 10:06:19.116904536 -0400
@@ -577,7 +577,9 @@
         case SO_OOBINLINE:
         case SO_NO_CHECK:
         case SO_PRIORITY:
+#ifdef HAVE_SO_BSDCOMPAT
         case SO_BSDCOMPAT:
+#endif
         case SO_PASSCRED:
         case SO_TIMESTAMP:
         case SO_RCVLOWAT: