From 2440ea25e770209a020f0076f0db776a7604a61a Mon Sep 17 00:00:00 2001 From: yabause Date: Fri, 17 Oct 2008 09:16:13 +0000 Subject: [PATCH] More warnings fixes by riccardom (patch 2157019) This one fix the warnings for SDL related stuff. I also removed an unused function... --- desmume/src/ctrlssdl.cpp | 2 +- desmume/src/sndsdl.cpp | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/desmume/src/ctrlssdl.cpp b/desmume/src/ctrlssdl.cpp index 0e0c6c2e3..d0683b9cd 100644 --- a/desmume/src/ctrlssdl.cpp +++ b/desmume/src/ctrlssdl.cpp @@ -217,7 +217,7 @@ u16 get_set_joy_key(int index) { } /* Reset corresponding key and its twin axis key */ -u16 get_joy_axis_twin(u16 key) +static u16 get_joy_axis_twin(u16 key) { switch(key) { diff --git a/desmume/src/sndsdl.cpp b/desmume/src/sndsdl.cpp index 74fbd9f8e..ca238cd62 100644 --- a/desmume/src/sndsdl.cpp +++ b/desmume/src/sndsdl.cpp @@ -55,7 +55,7 @@ static SDL_AudioSpec audiofmt; ////////////////////////////////////////////////////////////////////////////// -void MixAudio(void *userdata, Uint8 *stream, int len) { +static void MixAudio(void *userdata, Uint8 *stream, int len) { int i; Uint8 *soundbuf=(Uint8 *)stereodata16; @@ -124,13 +124,6 @@ void SNDSDLDeInit() ////////////////////////////////////////////////////////////////////////////// -int SNDSDLReset() -{ - return 0; -} - -////////////////////////////////////////////////////////////////////////////// - void SNDSDLUpdateAudio(s16 *buffer, u32 num_samples) { u32 copy1size=0, copy2size=0;