Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed bug 3517 - Compiler warnings with gcc -Wstrict-prototypes
felix

Compiling even a simple SDL2 'hello world' program with gcc -Wstrict-prototypes (GCC 6.2.1) results in warnings like:

/usr/include/SDL2/SDL_gamecontroller.h:143:1: attention : function declaration isn't a prototype [-Wstrict-prototypes]
 extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings();
 ^~~~~~

It seems there is a missing 'void' between the parentheses.
  • Loading branch information
slouken committed Dec 26, 2016
1 parent 9492492 commit b4e069e
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Xcode-iOS/Demos/src/common.c
Expand Up @@ -39,7 +39,7 @@ fatalError(const char *string)
static Uint64 prevTime = 0;

double
updateDeltaTime()
updateDeltaTime(void)
{
Uint64 curTime;
double deltaTime;
Expand Down
2 changes: 1 addition & 1 deletion Xcode-iOS/Demos/src/common.h
Expand Up @@ -7,4 +7,4 @@
extern int randomInt(int min, int max);
extern float randomFloat(float min, float max);
extern void fatalError(const char *string);
extern double updateDeltaTime();
extern double updateDeltaTime(void);
4 changes: 2 additions & 2 deletions include/SDL_atomic.h
Expand Up @@ -159,8 +159,8 @@ void _ReadWriteBarrier(void);
#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
#ifdef __thumb__
/* The mcr instruction isn't available in thumb mode, use real functions */
extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease();
extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire();
extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(void);
extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(void);
#else
#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_gamecontroller.h
Expand Up @@ -140,7 +140,7 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingStri
*
* \return the number of mappings
*/
extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings();
extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void);

/**
* Get the mapping at a particular index.
Expand Down
2 changes: 1 addition & 1 deletion src/core/linux/SDL_fcitx.c
Expand Up @@ -535,7 +535,7 @@ SDL_Fcitx_UpdateTextRect(SDL_Rect *rect)
}

void
SDL_Fcitx_PumpEvents()
SDL_Fcitx_PumpEvents(void)
{
SDL_DBusContext *dbus = fcitx_client.dbus;
DBusConnection *conn = dbus->session_conn;
Expand Down
2 changes: 1 addition & 1 deletion src/core/linux/SDL_fcitx.h
Expand Up @@ -33,7 +33,7 @@ extern void SDL_Fcitx_SetFocus(SDL_bool focused);
extern void SDL_Fcitx_Reset(void);
extern SDL_bool SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode);
extern void SDL_Fcitx_UpdateTextRect(SDL_Rect *rect);
extern void SDL_Fcitx_PumpEvents();
extern void SDL_Fcitx_PumpEvents(void);

#endif /* SDL_fcitx_h_ */

Expand Down
2 changes: 1 addition & 1 deletion src/core/linux/SDL_ibus.h
Expand Up @@ -49,7 +49,7 @@ extern void SDL_IBus_UpdateTextRect(SDL_Rect *window_relative_rect);

/* Checks DBus for new IBus events, and calls SDL_SendKeyboardText /
SDL_SendEditingText for each event it finds */
extern void SDL_IBus_PumpEvents();
extern void SDL_IBus_PumpEvents(void);

#endif /* HAVE_IBUS_IBUS_H */

Expand Down
2 changes: 1 addition & 1 deletion src/core/windows/SDL_windows.c
Expand Up @@ -115,7 +115,7 @@ IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServiceP
}
#endif

BOOL WIN_IsWindowsVistaOrGreater()
BOOL WIN_IsWindowsVistaOrGreater(void)
{
#ifdef __WINRT__
return TRUE;
Expand Down
2 changes: 1 addition & 1 deletion src/core/windows/SDL_windows.h
Expand Up @@ -57,7 +57,7 @@ extern HRESULT WIN_CoInitialize(void);
extern void WIN_CoUninitialize(void);

/* Returns SDL_TRUE if we're running on Windows Vista and newer */
extern BOOL WIN_IsWindowsVistaOrGreater();
extern BOOL WIN_IsWindowsVistaOrGreater(void);

/* You need to SDL_free() the result of this call. */
extern char *WIN_LookupAudioDeviceName(const WCHAR *name, const GUID *guid);
Expand Down
2 changes: 1 addition & 1 deletion src/joystick/SDL_gamecontroller.c
Expand Up @@ -891,7 +891,7 @@ SDL_GameControllerAddMapping(const char *mappingString)
* Get the number of mappings installed
*/
int
SDL_GameControllerNumMappings()
SDL_GameControllerNumMappings(void)
{
int num_mappings = 0;
ControllerMapping_t *mapping;
Expand Down
2 changes: 1 addition & 1 deletion src/video/haiku/SDL_bkeyboard.cc
Expand Up @@ -41,7 +41,7 @@ extern "C" {
static SDL_Scancode keymap[KEYMAP_SIZE];
static int8 keystate[KEYMAP_SIZE];

void BE_InitOSKeymap() {
void BE_InitOSKeymap(void) {
for( uint i = 0; i < SDL_TABLESIZE(keymap); ++i ) {
keymap[i] = SDL_SCANCODE_UNKNOWN;
}
Expand Down
2 changes: 1 addition & 1 deletion src/video/haiku/SDL_bkeyboard.h
Expand Up @@ -30,7 +30,7 @@ extern "C" {

#include "../../../include/SDL_keyboard.h"

extern void BE_InitOSKeymap();
extern void BE_InitOSKeymap(void);
extern SDL_Scancode BE_GetScancodeFromBeKey(int32 bkey);
extern int8 BE_GetKeyState(int32 bkey);
extern void BE_SetKeyState(int32 bkey, int8 state);
Expand Down
2 changes: 1 addition & 1 deletion src/video/uikit/SDL_uikitmessagebox.h
Expand Up @@ -22,7 +22,7 @@

#if SDL_VIDEO_DRIVER_UIKIT

extern SDL_bool UIKit_ShowingMessageBox();
extern SDL_bool UIKit_ShowingMessageBox(void);

extern int UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);

Expand Down
2 changes: 1 addition & 1 deletion src/video/uikit/SDL_uikitmessagebox.m
Expand Up @@ -31,7 +31,7 @@
static SDL_bool s_showingMessageBox = SDL_FALSE;

SDL_bool
UIKit_ShowingMessageBox()
UIKit_ShowingMessageBox(void)
{
return s_showingMessageBox;
}
Expand Down
2 changes: 1 addition & 1 deletion src/video/uikit/SDL_uikitopengles.h
Expand Up @@ -33,7 +33,7 @@ extern void UIKit_GL_DeleteContext(_THIS, SDL_GLContext context);
extern void *UIKit_GL_GetProcAddress(_THIS, const char *proc);
extern int UIKit_GL_LoadLibrary(_THIS, const char *path);

extern void UIKit_GL_RestoreCurrentContext();
extern void UIKit_GL_RestoreCurrentContext(void);

#endif

Expand Down
2 changes: 1 addition & 1 deletion src/video/uikit/SDL_uikitopengles.m
Expand Up @@ -228,7 +228,7 @@ int UIKit_GL_SwapWindow(_THIS, SDL_Window * window)
}

void
UIKit_GL_RestoreCurrentContext()
UIKit_GL_RestoreCurrentContext(void)
{
@autoreleasepool {
/* Some iOS system functionality (such as Dictation on the on-screen
Expand Down
2 changes: 1 addition & 1 deletion src/video/winrt/SDL_winrtevents.cpp
Expand Up @@ -105,7 +105,7 @@ WINRT_XAMLThreadMain(void * userdata)
}

void
WINRT_CycleXAMLThread()
WINRT_CycleXAMLThread(void)
{
switch (_threadState) {
case ThreadState_NotLaunched:
Expand Down
2 changes: 1 addition & 1 deletion src/video/winrt/SDL_winrtevents_c.h
Expand Up @@ -75,7 +75,7 @@ extern SDL_bool WINRT_IsScreenKeyboardShown(_THIS, SDL_Window *window);
#endif // NTDDI_VERSION >= ...

/* XAML Thread Management */
extern void WINRT_CycleXAMLThread();
extern void WINRT_CycleXAMLThread(void);

#endif // ifdef __cplusplus_winrt

Expand Down

0 comments on commit b4e069e

Please sign in to comment.