From 59a36a2f6728081050afc6ec97d0018467999f79 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 18 Jun 2009 20:11:03 +0200 Subject: [PATCH] Win32: Fix compilation with SDL. `sdl-config --cflags` defines main = SDL_main on some platforms. One of these platforms is Windows with mingw32. For those platforms, the solution already developed for __APPLE__ is now applied. A compiler warning (missing return value) is fixed, too. Maybe __APPLE__ no longer needs a separate check. Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 7ef9748..60a00e1 100644 --- a/vl.c +++ b/vl.c @@ -113,12 +113,12 @@ #endif #ifdef CONFIG_SDL -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(main) #include int qemu_main(int argc, char **argv, char **envp); int main(int argc, char **argv) { - qemu_main(argc, argv, NULL); + return qemu_main(argc, argv, NULL); } #undef main #define main qemu_main -- 2.7.4