From 399dfca1e3352050a5289be6bcd7b7dce353ccf8 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 1 Jan 2019 18:13:33 -0800
Subject: Rename ALCdevice_struct and ALCcontext_struct

A (possibly contentious?) change in the public headers. Those names were never
part of any specification, and I don't know why the struct names differed from
the actual type name. But with C++, which takes the original struct declaration
as the original name, it was affecting the type's internal symbols.

This shouldn't affect user code since ALCdevice_struct and ALCcontext_struct
were never part of the spec. If issues arise from this change, it should be
reported.
---
 Alc/alc.cpp               | 14 ++++++--------
 Alc/alcontext.h           | 10 +++++-----
 OpenAL32/Include/alMain.h | 10 +++++-----
 include/AL/alc.h          |  4 ++--
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index b69c4756..a8288acb 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -2189,17 +2189,16 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
 }
 
 
-ALCdevice_struct::ALCdevice_struct(DeviceType type)
-  : Type{type}
+ALCdevice::ALCdevice(DeviceType type) : Type{type}
 {
 }
 
-/* ALCdevice_struct::~ALCdevice_struct
+/* ALCdevice::~ALCdevice
  *
  * Frees the device structure, and destroys any objects the app failed to
  * delete. Called once there's no more references on the device.
  */
-ALCdevice_struct::~ALCdevice_struct()
+ALCdevice::~ALCdevice()
 {
     TRACE("%p\n", this);
 
@@ -2311,8 +2310,7 @@ static DeviceRef VerifyDevice(ALCdevice *device)
 }
 
 
-ALCcontext_struct::ALCcontext_struct(ALCdevice *device)
-  : Device{device}
+ALCcontext::ALCcontext(ALCdevice *device) : Device{device}
 {
 }
 
@@ -2373,12 +2371,12 @@ static ALvoid InitContext(ALCcontext *Context)
 }
 
 
-/* ALCcontext_struct::~ALCcontext_struct()
+/* ALCcontext::~ALCcontext()
  *
  * Cleans up the context, and destroys any remaining objects the app failed to
  * delete. Called once there's no more references on the context.
  */
-ALCcontext_struct::~ALCcontext_struct()
+ALCcontext::~ALCcontext()
 {
     TRACE("%p\n", this);
 
diff --git a/Alc/alcontext.h b/Alc/alcontext.h
index f843809b..77ba8910 100644
--- a/Alc/alcontext.h
+++ b/Alc/alcontext.h
@@ -61,7 +61,7 @@ struct SourceSubList {
  */
 using ALeffectslotPtr = std::unique_ptr<ALeffectslot>;
 
-struct ALCcontext_struct {
+struct ALCcontext {
     RefCount ref{1u};
 
     al::vector<SourceSubList> SourceList;
@@ -129,10 +129,10 @@ struct ALCcontext_struct {
     ALlistener Listener{};
 
 
-    ALCcontext_struct(ALCdevice *device);
-    ALCcontext_struct(const ALCcontext_struct&) = delete;
-    ALCcontext_struct& operator=(const ALCcontext_struct&) = delete;
-    ~ALCcontext_struct();
+    ALCcontext(ALCdevice *device);
+    ALCcontext(const ALCcontext&) = delete;
+    ALCcontext& operator=(const ALCcontext&) = delete;
+    ~ALCcontext();
 
     DEF_NEWDEL(ALCcontext)
 };
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index e3f24829..69ec9749 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -663,7 +663,7 @@ struct RealMixParams {
 
 using POSTPROCESS = void(*)(ALCdevice *device, ALsizei SamplesToDo);
 
-struct ALCdevice_struct {
+struct ALCdevice {
     RefCount ref{1u};
 
     std::atomic<bool> Connected{true};
@@ -795,10 +795,10 @@ struct ALCdevice_struct {
     std::atomic<ALCdevice*> next{nullptr};
 
 
-    ALCdevice_struct(DeviceType type);
-    ALCdevice_struct(const ALCdevice_struct&) = delete;
-    ALCdevice_struct& operator=(const ALCdevice_struct&) = delete;
-    ~ALCdevice_struct();
+    ALCdevice(DeviceType type);
+    ALCdevice(const ALCdevice&) = delete;
+    ALCdevice& operator=(const ALCdevice&) = delete;
+    ~ALCdevice();
 
     ALsizei bytesFromFmt() const noexcept { return BytesFromDevFmt(FmtType); }
     ALsizei channelsFromFmt() const noexcept { return ChannelsFromDevFmt(FmtChans, mAmbiOrder); }
diff --git a/include/AL/alc.h b/include/AL/alc.h
index 294e8b33..5786bad2 100644
--- a/include/AL/alc.h
+++ b/include/AL/alc.h
@@ -31,9 +31,9 @@ extern "C" {
 #define ALC_VERSION_0_1                          1
 
 /** Opaque device handle */
-typedef struct ALCdevice_struct ALCdevice;
+typedef struct ALCdevice ALCdevice;
 /** Opaque context handle */
-typedef struct ALCcontext_struct ALCcontext;
+typedef struct ALCcontext ALCcontext;
 
 /** 8-bit boolean */
 typedef char ALCboolean;
-- 
cgit v1.2.3