# HG changeset patch # User Couriersud # Date 1249322851 0 # Node ID 816a7a65a59a620d96287b19500c455d7e600f95 # Parent 09172593e9b6bbbc2236072345872dbc0125e223 Fixed compiling SDL_fsaudio.c against fusionsound 1.0.0 diff -r 09172593e9b6 -r 816a7a65a59a src/audio/fusionsound/SDL_fsaudio.c --- a/src/audio/fusionsound/SDL_fsaudio.c Sun Aug 02 20:45:11 2009 +0000 +++ b/src/audio/fusionsound/SDL_fsaudio.c Mon Aug 03 18:07:31 2009 +0000 @@ -34,6 +34,8 @@ #include "../SDL_audio_c.h" #include "SDL_fsaudio.h" +#include + //#define SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC "libfusionsound.so" #ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC @@ -43,6 +45,10 @@ #define SDL_NAME(X) X #endif +#if (FUSIONSOUND_MAJOR_VERSION == 1) && (FUSIONSOUND_MINOR_VERSION < 1) +typedef DFBResult DirectResult; +#endif + /* The tag name used by fusionsoundc audio */ #define SDL_FS_DRIVER_NAME "fusionsound" /* Buffers to use - more than 2 gives a lot of latency */ @@ -53,8 +59,8 @@ static const char *fs_library = SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC; static void *fs_handle = NULL; -static DirectResult(*SDL_NAME(FusionSoundInit)) (int *argc, char *(*argv[])); -static DirectResult(*SDL_NAME(FusionSoundCreate)) (IFusionSound ** +static DirectResult (*SDL_NAME(FusionSoundInit)) (int *argc, char *(*argv[])); +static DirectResult (*SDL_NAME(FusionSoundCreate)) (IFusionSound ** ret_interface); #define SDL_FS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) }