diff options
| -rw-r--r-- | qemu-common.h | 5 | ||||
| -rw-r--r-- | ui/cocoa.m | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/qemu-common.h b/qemu-common.h index 39fabc9e0f..109498dd4d 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -132,6 +132,11 @@ static inline char *realpath(const char *path, char *resolved_path) #endif /* !defined(NEED_CPU_H) */ +/* main function, renamed */ +#if defined(CONFIG_COCOA) +int qemu_main(int argc, char **argv, char **envp); +#endif + /* bottom halves */ typedef void QEMUBHFunc(void *opaque); diff --git a/ui/cocoa.m b/ui/cocoa.m index e1312d347a..1c54759775 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -23,6 +23,7 @@ */ #import <Cocoa/Cocoa.h> +#include <crt_externs.h> #include "qemu-common.h" #include "console.h" @@ -61,7 +62,6 @@ typedef struct { int bitsPerPixel; } QEMUScreen; -int qemu_main(int argc, char **argv); // main defined in qemu/vl.c NSWindow *normalWindow; id cocoaView; static DisplayChangeListener *dcl; @@ -794,7 +794,7 @@ static int cocoa_keycode_to_qemu(int keycode) COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n"); int status; - status = qemu_main(argc, argv); + status = qemu_main(argc, argv, *_NSGetEnviron()); exit(status); } @@ -877,7 +877,7 @@ int main (int argc, const char * argv[]) { !strcmp(opt, "-nographic") || !strcmp(opt, "-version") || !strcmp(opt, "-curses")) { - return qemu_main(gArgc, gArgv); + return qemu_main(gArgc, gArgv, *_NSGetEnviron()); } } } |