From 079e34d4a1877206856ca06e442b641fb833359b Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 26 Sep 2009 10:51:23 +0000 Subject: [PATCH] Fixed bug #808 O.Sezer 2009-09-26 03:48:05 PDT native_midi_error() returns strings at many places but is declared to return char* instead of co?nst char*. The attached patch makes native_midi_error() to return const char*. --- native_midi/native_midi.h | 2 +- native_midi/native_midi_mac.c | 2 +- native_midi/native_midi_win32.c | 2 +- native_midi_gpl/native_midi_gpl.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native_midi/native_midi.h b/native_midi/native_midi.h index 3b8e6db6..ec4cdcc0 100644 --- a/native_midi/native_midi.h +++ b/native_midi/native_midi.h @@ -35,6 +35,6 @@ void native_midi_start(NativeMidiSong *song); void native_midi_stop(); int native_midi_active(); void native_midi_setvolume(int volume); -char *native_midi_error(); +const char *native_midi_error(void); #endif /* _NATIVE_MIDI_H_ */ diff --git a/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c index e107ce6d..405ee0d6 100644 --- a/native_midi/native_midi_mac.c +++ b/native_midi/native_midi_mac.c @@ -339,7 +339,7 @@ void native_midi_setvolume(int volume) TuneSetVolume(gTunePlayer, (0x00010000 * volume)/SDL_MIX_MAXVOLUME); } -char *native_midi_error() +const char *native_midi_error(void) { return gErrorBuffer; } diff --git a/native_midi/native_midi_win32.c b/native_midi/native_midi_win32.c index 9f922c61..35ae7d94 100644 --- a/native_midi/native_midi_win32.c +++ b/native_midi/native_midi_win32.c @@ -311,7 +311,7 @@ void native_midi_setvolume(int volume) midiOutSetVolume((HMIDIOUT)hMidiStream, MAKELONG(calcVolume , calcVolume)); } -char *native_midi_error() +const char *native_midi_error(void) { return ""; } diff --git a/native_midi_gpl/native_midi_gpl.c b/native_midi_gpl/native_midi_gpl.c index c44e9e9e..16e66d00 100644 --- a/native_midi_gpl/native_midi_gpl.c +++ b/native_midi_gpl/native_midi_gpl.c @@ -315,7 +315,7 @@ void native_midi_setvolume(int volume) { } -char *native_midi_error() +const char *native_midi_error(void) { return "stala sa chyba"; }