From 1353cb0d883f5b0f3c6f7170f3637425d0a6fc5c Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 18 Apr 2014 02:21:58 -0700 Subject: [PATCH] Rename AL_ONCE_INIT to AL_ONCE_FLAG_INIT --- Alc/ALc.c | 2 +- OpenAL32/Include/threads.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index 82316846..f155dab4 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -737,7 +737,7 @@ enum LogLevel LogLevel = LogError; static ALCboolean TrapALCError = ALC_FALSE; /* One-time configuration init control */ -static alonce_flag alc_config_once = AL_ONCE_INIT; +static alonce_flag alc_config_once = AL_ONCE_FLAG_INIT; /* Default effect that applies to sources that don't have an effect on send 0 */ static ALeffect DefaultEffect; diff --git a/OpenAL32/Include/threads.h b/OpenAL32/Include/threads.h index 07d5ef79..3b9f8654 100644 --- a/OpenAL32/Include/threads.h +++ b/OpenAL32/Include/threads.h @@ -42,7 +42,7 @@ typedef CRITICAL_SECTION almtx_t; typedef DWORD altss_t; typedef LONG alonce_flag; -#define AL_ONCE_INIT 0 +#define AL_ONCE_FLAG_INIT 0 int althrd_sleep(const struct timespec *ts, struct timespec *rem); void alcall_once(alonce_flag *once, void (*callback)(void)); @@ -116,7 +116,7 @@ typedef pthread_mutex_t almtx_t; typedef pthread_key_t altss_t; typedef pthread_once_t alonce_flag; -#define AL_ONCE_INIT PTHREAD_ONCE_INIT +#define AL_ONCE_FLAG_INIT PTHREAD_ONCE_INIT inline althrd_t althrd_current(void) -- 2.11.4.GIT