Move ALfloatBUFFERSIZE to a common location

2 files changed, 9 insertions, 4 deletions

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 9d49bf13..c7182d9b 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -25,10 +25,6 @@ struct ALeffectStateVtable {
     void (*const Delete)(struct ALeffectState *state);
 };
 
-/* Small hack to use a pointer-to-array type as a normal argument type.
- * Shouldn't be used directly. */
-typedef ALfloat ALfloatBUFFERSIZE[BUFFERSIZE];
-
 #define DEFINE_ALEFFECTSTATE_VTABLE(T)                                        \
 DECLARE_THUNK(T, ALeffectState, void, Destruct)                               \
 DECLARE_THUNK1(T, ALeffectState, ALboolean, deviceUpdate, ALCdevice*)         \
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index e0753ea8..fb0d08bd 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -103,6 +103,10 @@ static const union {
 rettype T1##_##func(T1 *obj)                                                  \
 { return T2##_##func(STATIC_CAST(T2, obj)); }
 
+#define DECLARE_FORWARD1(T1, T2, rettype, func, argtype1)                     \
+rettype T1##_##func(T1 *obj, argtype1 a)                                      \
+{ return T2##_##func(STATIC_CAST(T2, obj), a); }
+
 #define DECLARE_FORWARD2(T1, T2, rettype, func, argtype1, argtype2)           \
 rettype T1##_##func(T1 *obj, argtype1 a, argtype2 b)                          \
 { return T2##_##func(STATIC_CAST(T2, obj), a, b); }
@@ -626,6 +630,11 @@ void FillCPUCaps(ALuint capfilter);
 } while(0)
 
 
+/* Small hack to use a pointer-to-array type as a normal argument type.
+ * Shouldn't be used directly. */
+typedef ALfloat ALfloatBUFFERSIZE[BUFFERSIZE];
+
+
 #ifdef __cplusplus
 }
 #endif