commit 9ea4b024c233201bf72ded262550f6da0d1566e3
Merge: 98f4af33 2d68e079
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Sat Aug 18 00:47:56 2018 -0400
Commit:     GitHub <noreply@github.com>
CommitDate: Sat Aug 18 00:47:56 2018 -0400

    Merge pull request #1079 from hifi/fix-setup-crash

    setup: Use proper function signatures for callbacks

 src/setup/compatibility.c | 2 +-
 src/setup/compatibility.h | 2 +-
 src/setup/display.c       | 2 +-
 src/setup/display.h       | 2 +-
 src/setup/joystick.c      | 2 +-
 src/setup/joystick.h      | 2 +-
 src/setup/keyboard.c      | 2 +-
 src/setup/keyboard.h      | 2 +-
 src/setup/mouse.c         | 2 +-
 src/setup/mouse.h         | 2 +-
 src/setup/multiplayer.c   | 8 ++++----
 src/setup/multiplayer.h   | 8 ++++----
 src/setup/sound.c         | 2 +-
 src/setup/sound.h         | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)