Rename the effect state's Destroy method to Destruct

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 6d5ad8bb..537f0a8a 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -14,7 +14,7 @@ typedef struct ALeffectState ALeffectState;
 typedef struct ALeffectslot ALeffectslot;
 
 struct ALeffectStateVtable {
-    ALvoid (*const Destroy)(ALeffectState *state);
+    ALvoid (*const Destruct)(ALeffectState *state);
     ALboolean (*const DeviceUpdate)(ALeffectState *state, ALCdevice *device);
     ALvoid (*const Update)(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot);
     ALvoid (*const Process)(ALeffectState *state, ALuint samplesToDo, const ALfloat *RESTRICT samplesIn, ALfloat (*RESTRICT samplesOut)[BUFFERSIZE]);
@@ -25,15 +25,15 @@ struct ALeffectState {
     const struct ALeffectStateVtable *vtbl;
 };
 
-#define ALeffectState_Destroy(a)        ((a)->vtbl->Destroy((a)))
+#define ALeffectState_Destruct(a)       ((a)->vtbl->Destruct((a)))
 #define ALeffectState_DeviceUpdate(a,b) ((a)->vtbl->DeviceUpdate((a),(b)))
 #define ALeffectState_Update(a,b,c)     ((a)->vtbl->Update((a),(b),(c)))
 #define ALeffectState_Process(a,b,c,d)  ((a)->vtbl->Process((a),(b),(c),(d)))
 #define ALeffectState_getCreator(a)     ((a)->vtbl->getCreator())
 
 #define DEFINE_ALEFFECTSTATE_VTABLE(T)                                        \
-static ALvoid T##_ALeffectState_Destroy(ALeffectState *state)                 \
-{ T##_Destroy(STATIC_UPCAST(T, ALeffectState, state)); }                      \
+static ALvoid T##_ALeffectState_Destruct(ALeffectState *state)                \
+{ T##_Destruct(STATIC_UPCAST(T, ALeffectState, state)); }                     \
 static ALboolean T##_ALeffectState_DeviceUpdate(ALeffectState *state, ALCdevice *device) \
 { return T##_DeviceUpdate(STATIC_UPCAST(T, ALeffectState, state), device); }             \
 static ALvoid T##_ALeffectState_Update(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot) \
@@ -44,7 +44,7 @@ static ALeffectStateFactory* T##_ALeffectState_getCreator(void)               \
 { return T##_getCreator(); }                                                  \
                                                                               \
 static const struct ALeffectStateVtable T##_ALeffectState_vtable = {          \
-    T##_ALeffectState_Destroy,                                                \
+    T##_ALeffectState_Destruct,                                               \
     T##_ALeffectState_DeviceUpdate,                                           \
     T##_ALeffectState_Update,                                                 \
     T##_ALeffectState_Process,                                                \
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 0daeaeb1..4003d440 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -411,7 +411,7 @@ typedef struct ALnoneState {
     DERIVE_FROM_TYPE(ALeffectState);
 } ALnoneState;
 
-static ALvoid ALnoneState_Destroy(ALnoneState *state)
+static ALvoid ALnoneState_Destruct(ALnoneState *state)
 {
     (void)state;
 }
@@ -456,7 +456,7 @@ ALeffectState *ALnoneStateFactory_create(void)
 static ALvoid ALnoneStateFactory_destroy(ALeffectState *effect)
 {
     ALnoneState *state = STATIC_UPCAST(ALnoneState, ALeffectState, effect);
-    ALnoneState_Destroy(state);
+    ALnoneState_Destruct(state);
     free(state);
 }