gwj / at91sam9263 · Commits

Commit 59a36a2f6728081050afc6ec97d0018467999f79

Authored by Stefan Weil
Committed by Anthony Liguori
1 parent 6243375f

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>
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -113,12 +113,12 @@ @@ -113,12 +113,12 @@
113 #endif 113 #endif
114 114
115 #ifdef CONFIG_SDL 115 #ifdef CONFIG_SDL
116 -#ifdef __APPLE__ 116 +#if defined(__APPLE__) || defined(main)
117 #include <SDL.h> 117 #include <SDL.h>
118 int qemu_main(int argc, char **argv, char **envp); 118 int qemu_main(int argc, char **argv, char **envp);
119 int main(int argc, char **argv) 119 int main(int argc, char **argv)
120 { 120 {
121 - qemu_main(argc, argv, NULL); 121 + return qemu_main(argc, argv, NULL);
122 } 122 }
123 #undef main 123 #undef main
124 #define main qemu_main 124 #define main qemu_main