[Qemu-devel] SDL fix (was: [PATCH] Fix OS X SDL breakage)

[Daniel Egger]

On 30.01.2005, at 21:21, Bernhard Ehlers wrote:

> So the removal of the #include <SDL/SDL.h> crashes the executable on 
> MAC OSX. That means it has to stay.

Thanks a lot for your investigation. I would call the result
surprising but now we should be able to fix this appropriately.

On a side note: I've been looking into the SDL headers and the
only thing which seems to affect OS X is the hunk starting in
SDL_main.h starting with:

/* Redefine main() on Win32 and MacOS so that it is called by winmain.c 
*/

#if defined(WIN32) || defined(_WIN32) || \
    (defined(__MWERKS__) && !defined(__BEOS__)) || \
    defined(macintosh) || defined(__APPLE__) || \
    defined(__SYMBIAN32__) || defined(QWS)

#ifdef __cplusplus
#define C_LINKAGE       "C"
#else
#define C_LINKAGE
#endif /* __cplusplus */


Looking at this it really seems that ...

> -#ifdef CONFIG_SDL
> -#ifdef __APPLE__
> -#include <SDL/SDL.h>
> +#include <SDL.h>
> -#endif
> -#endif /* CONFIG_SDL */

might be more sensible and seems nicer to me. Any idea
why the Win version seems to work wihtout it?


Servus,
      Daniel

PGP.sig
Description: This is a digitally signed message part