commit 847056af1d9a903a66d361ca6fcbd8004c9c2466
Merge: bbc6c36a 222ba923
Author:     Turo Lamminen <turol@users.noreply.github.com>
AuthorDate: Mon Oct 3 12:33:21 2022 +0300
Commit:     GitHub <noreply@github.com>
CommitDate: Mon Oct 3 12:33:21 2022 +0300

    Merge pull request #1513 from turol/extern-setup

    Clean up extern, more misc bits

 src/i_sound.c             | 23 -----------------------
 src/i_sound.h             | 23 +++++++++++++++++++++++
 src/setup/display.c       |  1 -
 src/setup/joystick.h      |  6 ++++++
 src/setup/mainmenu.c      |  9 ---------
 src/setup/sound.c         |  6 +++---
 src/setup/txt_joybinput.c |  1 -
 textscreen/txt_sdl.h      |  4 ++++
 8 files changed, 36 insertions(+), 37 deletions(-)