From: Stefan Weil <weil@mail.berlios.de>
Date: Thu, 18 Jun 2009 18:11:03 +0000 (+0200)
Subject: Win32: Fix compilation with SDL.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=59a36a2f6728081050afc6ec97d0018467999f79;p=qemu.git

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 <weil@mail.berlios.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index 7ef97484bf..60a00e1b25 100644
--- a/vl.c
+++ b/vl.c
@@ -113,12 +113,12 @@
 #endif
 
 #ifdef CONFIG_SDL
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(main)
 #include <SDL.h>
 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