Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / darwin-user / qemu.h

diff --git a/darwin-user/qemu.h b/darwin-user/qemu.h
index 41b57f8..462bbda 100644 (file)
--- a/darwin-user/qemu.h
+++ b/darwin-user/qemu.h
@@ -109,11 +109,10 @@ void cpu_loop(CPUState *env);
 void init_paths(const char *prefix);
 const char *path(const char *pathname);
 
-extern int loglevel;
-extern FILE *logfile;
+#include "qemu-log.h"
 
 /* commpage.c */
-void commpage_init();
+void commpage_init(void);
 void do_commpage(void *cpu_env, int num, uint32_t arg1, uint32_t arg2, uint32_t arg3,
                 uint32_t arg4, uint32_t arg5, uint32_t arg6, uint32_t arg7, uint32_t arg8);