From b3d35170ce50ead1c6cc9fab3ecd9c8ba79b54ff Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 6 Dec 2007 22:22:11 -0800 Subject: [PATCH] Move some global declrations into headers --- Alc/ALc.c | 11 ----------- OpenAL32/Include/alMain.h | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index 2b1c4ba6..9ea7a51f 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -38,14 +38,6 @@ char szDebug[256]; /////////////////////////////////////////////////////// -/////////////////////////////////////////////////////// -// FUNCTION PROTOTYPES - -void alc_alsa_init(BackendFuncs *func_list); -void alc_oss_init(BackendFuncs *func_list); -void alcDSoundInit(BackendFuncs *func_list); -void alcWinMMInit(BackendFuncs *FuncList); - #define EmptyFuncs { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } struct { const char *name; @@ -180,9 +172,6 @@ static ALCint alcMinorVersion = 1; /////////////////////////////////////////////////////// // Global Variables -// Critical Section data -extern CRITICAL_SECTION g_mutex; - // Context List static ALCcontext *g_pContextList = NULL; static ALCuint g_ulContextCount = 0; diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 4c63ef6b..edd9a19f 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -72,6 +72,8 @@ extern "C" { #endif +extern CRITICAL_SECTION g_mutex; + extern char szDebug[256]; #define AL_PRINT(...) do { \ @@ -109,6 +111,12 @@ typedef struct { ALCuint (*AvailableSamples)(ALCdevice*); } BackendFuncs; +void alc_alsa_init(BackendFuncs *func_list); +void alc_oss_init(BackendFuncs *func_list); +void alcDSoundInit(BackendFuncs *func_list); +void alcWinMMInit(BackendFuncs *FuncList); + + struct ALCdevice_struct { ALboolean InUse;