From bb178a0a5ad12f1b002b0a1b2f0a14f14dfeca74 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Mon, 10 Oct 2022 05:01:02 +0300
Subject: [PATCH] move extern delarations of the struct sound_driver data to
 sound.h

remove broken declarations of sound_oss, sound_file, and sound_wav
from their corresponding sources.
---
 src/sound.c      | 23 -----------------------
 src/sound.h      | 23 +++++++++++++++++++++++
 src/sound_file.c |  2 --
 src/sound_oss.c  |  2 --
 src/sound_wav.c  |  3 ---
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/sound.c b/src/sound.c
index 3b175fe..b6d0c97 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -10,29 +10,6 @@
 #include <string.h>
 #include "sound.h"
 
-extern struct sound_driver sound_null;
-extern struct sound_driver sound_wav;
-extern struct sound_driver sound_aiff;
-extern struct sound_driver sound_file;
-extern struct sound_driver sound_qnx;
-extern struct sound_driver sound_alsa05;
-extern struct sound_driver sound_oss;
-extern struct sound_driver sound_alsa;
-extern struct sound_driver sound_os2dart;
-extern struct sound_driver sound_win32;
-extern struct sound_driver sound_pulseaudio;
-extern struct sound_driver sound_coreaudio;
-extern struct sound_driver sound_hpux;
-extern struct sound_driver sound_sndio;
-extern struct sound_driver sound_sgi;
-extern struct sound_driver sound_solaris;
-extern struct sound_driver sound_netbsd;
-extern struct sound_driver sound_bsd;
-extern struct sound_driver sound_beos;
-extern struct sound_driver sound_aix;
-extern struct sound_driver sound_ahi;
-extern struct sound_driver sound_sb;
-
 LIST_HEAD(sound_driver_list);
 
 static void register_sound_driver(struct sound_driver *sd)
diff --git a/src/sound.h b/src/sound.h
index 9c53f69..153a6c7 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -19,6 +19,29 @@ struct sound_driver {
 	struct list_head list;
 };
 
+extern struct sound_driver sound_null;
+extern struct sound_driver sound_wav;
+extern struct sound_driver sound_aiff;
+extern struct sound_driver sound_file;
+extern struct sound_driver sound_qnx;
+extern struct sound_driver sound_alsa05;
+extern struct sound_driver sound_oss;
+extern struct sound_driver sound_alsa;
+extern struct sound_driver sound_os2dart;
+extern struct sound_driver sound_win32;
+extern struct sound_driver sound_pulseaudio;
+extern struct sound_driver sound_coreaudio;
+extern struct sound_driver sound_hpux;
+extern struct sound_driver sound_sndio;
+extern struct sound_driver sound_sgi;
+extern struct sound_driver sound_solaris;
+extern struct sound_driver sound_netbsd;
+extern struct sound_driver sound_bsd;
+extern struct sound_driver sound_beos;
+extern struct sound_driver sound_aix;
+extern struct sound_driver sound_ahi;
+extern struct sound_driver sound_sb;
+
 #define parm_init(p) { char *token; for (; *(p); (p)++) { \
 	char s[80]; strncpy(s, *(p), 79); s[79] = 0; \
 	token = strtok(s, ":="); token = strtok(NULL, "");
diff --git a/src/sound_file.c b/src/sound_file.c
index 3fbc384..4747284 100644
--- a/src/sound_file.c
+++ b/src/sound_file.c
@@ -14,8 +14,6 @@ static FILE *fd;
 static long size;
 static int swap_endian;
 
-struct sound_driver sound_file;
-
 static int init(struct options *options)
 {
 	char **parm = options->driver_parm;
diff --git a/src/sound_oss.c b/src/sound_oss.c
index 234bb06..980ae2a 100644
--- a/src/sound_oss.c
+++ b/src/sound_oss.c
@@ -36,8 +36,6 @@
 #  endif
 #endif
 
-struct sound_driver sound_oss;
-
 static int audio_fd;
 
 static int fragnum, fragsize;
diff --git a/src/sound_wav.c b/src/sound_wav.c
index 117dde9..eceda07 100644
--- a/src/sound_wav.c
+++ b/src/sound_wav.c
@@ -15,8 +15,6 @@ static int format_16bit;
 static int swap_endian;
 static long size;
 
-struct sound_driver sound_wav;
-
 static void write_16l(FILE *f, unsigned short v)
 {
 	unsigned char x;
@@ -157,7 +155,6 @@ static void onresume(void)
 {
 }
 
-
 struct sound_driver sound_wav = {
 	"wav",
 	"WAV writer",