configure: add '--disable-cocoa' switch

[qemu.git] / darwin-user / qemu.h

diff --git a/darwin-user/qemu.h b/darwin-user/qemu.h
index 4084819d9b2707ea969f24b09003ce88b5c37152..9e16c8e7ba5eb0796d35f3bfd9d3afda6ec4b2c2 100644 (file)
--- a/darwin-user/qemu.h
+++ b/darwin-user/qemu.h
@@ -10,7 +10,7 @@
 
 #include "gdbstub.h"
 
-typedef siginfo_t a_target_siginfo;
+typedef siginfo_t target_siginfo_t;
 #define target_sigaction       sigaction
 #ifdef TARGET_I386
 struct target_pt_regs {
@@ -99,13 +99,13 @@ int do_sigaction(int sig, const struct sigaction *act,
                  struct sigaction *oact);
 int do_sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss);
 
-void gemu_log(const char *fmt, ...) __attribute__((format(printf,1,2)));
-void qerror(const char *fmt, ...);
+void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
+void qerror(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
 
 void write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags);
 
-extern CPUState *global_env;
-void cpu_loop(CPUState *env);
+extern CPUArchState *global_env;
+void cpu_loop(CPUArchState *env);
 void init_paths(const char *prefix);
 const char *path(const char *pathname);
 
@@ -122,7 +122,7 @@ void signal_init(void);
 int queue_signal(int sig, target_siginfo_t *info);
 void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info);
 void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo);
-long do_sigreturn(CPUState *env, int num);
+long do_sigreturn(CPUArchState *env, int num);
 
 /* machload.c */
 int mach_exec(const char * filename, char ** argv, char ** envp,