Move the aligned malloc functions to the common lib

4 files changed, 6 insertions, 5 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 4c737f02..17edd7fc 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -36,6 +36,7 @@
 #include "uintmap.h"
 #include "vector.h"
 #include "alstring.h"
+#include "almalloc.h"
 
 #include "hrtf.h"
 
@@ -637,11 +638,6 @@ inline void UnlockContext(ALCcontext *context)
 { ALCdevice_Unlock(context->Device); }
 
 
-void *al_malloc(size_t alignment, size_t size);
-void *al_calloc(size_t alignment, size_t size);
-void al_free(void *ptr);
-
-
 typedef struct {
 #ifdef HAVE_FENV_H
     DERIVE_FROM_TYPE(fenv_t);
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index c80bab22..0364c33c 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -31,6 +31,8 @@
 #include "alError.h"
 #include "alSource.h"
 
+#include "almalloc.h"
+
 
 extern inline struct ALeffectslot *LookupEffectSlot(ALCcontext *context, ALuint id);
 extern inline struct ALeffectslot *RemoveEffectSlot(ALCcontext *context, ALuint id);
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index d7b68185..03eae080 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -37,6 +37,7 @@
 #include "backends/base.h"
 
 #include "threads.h"
+#include "almalloc.h"
 
 
 extern inline struct ALsource *LookupSource(ALCcontext *context, ALuint id);
diff --git a/OpenAL32/alThunk.c b/OpenAL32/alThunk.c
index 0cebad42..29da9bbd 100644
--- a/OpenAL32/alThunk.c
+++ b/OpenAL32/alThunk.c
@@ -25,6 +25,8 @@
 #include "alMain.h"
 #include "alThunk.h"
 
+#include "almalloc.h"
+
 
 static ATOMIC(ALenum) *ThunkArray;
 static ALuint          ThunkArraySize;