Fixed some ultra-pedantic gcc warnings
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401619
This commit is contained in:
parent
1237375c2d
commit
26cb9c7c80
9 changed files with 73 additions and 72 deletions
|
@ -29,8 +29,8 @@ extern int SDL_StartEventLoop(Uint32 flags);
|
|||
extern void SDL_StopEventLoop(void);
|
||||
extern void SDL_QuitInterrupt(void);
|
||||
|
||||
extern void SDL_Lock_EventThread();
|
||||
extern void SDL_Unlock_EventThread();
|
||||
extern void SDL_Lock_EventThread(void);
|
||||
extern void SDL_Unlock_EventThread(void);
|
||||
extern Uint32 SDL_EventThreadID(void);
|
||||
|
||||
/* Event handler init routines */
|
||||
|
|
|
@ -34,7 +34,7 @@ static Uint8 SDL_KeyState[SDLK_LAST];
|
|||
static SDLMod SDL_ModState;
|
||||
int SDL_TranslateUNICODE = 0;
|
||||
|
||||
static char *keynames[SDLK_LAST]; /* Array of keycode names */
|
||||
static const char *keynames[SDLK_LAST]; /* Array of keycode names */
|
||||
|
||||
/*
|
||||
* jk 991215 - added
|
||||
|
@ -356,7 +356,7 @@ void SDL_SetModState (SDLMod modstate)
|
|||
|
||||
char *SDL_GetKeyName(SDLKey key)
|
||||
{
|
||||
char *keyname;
|
||||
const char *keyname;
|
||||
|
||||
keyname = NULL;
|
||||
if ( key < SDLK_LAST ) {
|
||||
|
@ -365,7 +365,8 @@ char *SDL_GetKeyName(SDLKey key)
|
|||
if ( keyname == NULL ) {
|
||||
keyname = "unknown key";
|
||||
}
|
||||
return(keyname);
|
||||
/* FIXME: make this function const in 1.3 */
|
||||
return (char *)(keyname);
|
||||
}
|
||||
|
||||
/* These are global for SDL_eventloop.c */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue