aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--OpenAL32/alListener.cpp (renamed from OpenAL32/alListener.c)5
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df190c60..30375389 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -789,7 +789,7 @@ SET(OPENAL_OBJS
OpenAL32/Include/alFilter.h
OpenAL32/alFilter.c
OpenAL32/Include/alListener.h
- OpenAL32/alListener.c
+ OpenAL32/alListener.cpp
OpenAL32/Include/alSource.h
OpenAL32/alSource.cpp
OpenAL32/alState.cpp
diff --git a/OpenAL32/alListener.c b/OpenAL32/alListener.cpp
index 700fa0af..809b0318 100644
--- a/OpenAL32/alListener.c
+++ b/OpenAL32/alListener.cpp
@@ -462,7 +462,7 @@ void UpdateListenerProps(ALCcontext *context)
/* Get an unused proprty container, or allocate a new one as needed. */
props = ATOMIC_LOAD(&context->FreeListenerProps, almemory_order_acquire);
if(!props)
- props = al_calloc(16, sizeof(*props));
+ props = static_cast<ALlistenerProps*>(al_calloc(16, sizeof(*props)));
else
{
struct ALlistenerProps *next;
@@ -491,7 +491,8 @@ void UpdateListenerProps(ALCcontext *context)
props->Gain = listener->Gain;
/* Set the new container for updating internal parameters. */
- props = ATOMIC_EXCHANGE_PTR(&listener->Update, props, almemory_order_acq_rel);
+ props = static_cast<ALlistenerProps*>(ATOMIC_EXCHANGE_PTR(&listener->Update, props,
+ almemory_order_acq_rel));
if(props)
{
/* If there was an unused update container, put it back in the