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>
This commit is contained in:
Stefan Weil 2009-06-18 20:11:03 +02:00 committed by Anthony Liguori
parent 6243375f9b
commit 59a36a2f67

4
vl.c
View file

@ -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