aboutsummaryrefslogtreecommitdiffstats
path: root/al
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2023-06-08 07:08:43 -0700
committerChris Robinson <[email protected]>2023-06-11 20:31:34 -0700
commitc89027cea681f71f3e4e4fac81f3ed212bada669 (patch)
treef08b6f05bd2bb9879904bf8b2b172b66dbe3b07b /al
parent2d86d8b84fa54df4f6ce5e4942e617164cb5cc6d (diff)
Always use Windows' GUID definition on Windows
Diffstat (limited to 'al')
-rw-r--r--al/eax/api.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/al/eax/api.h b/al/eax/api.h
index b3a09d29..8795d833 100644
--- a/al/eax/api.h
+++ b/al/eax/api.h
@@ -10,17 +10,18 @@
//
+#include <array>
#include <cfloat>
#include <cstdint>
#include <cstring>
-
-#include <array>
+#ifdef _WIN32
+#include <guiddef.h>
+#endif
#include "AL/al.h"
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
+#ifndef _WIN32
typedef struct _GUID {
std::uint32_t Data1;
std::uint16_t Data2;
@@ -28,15 +29,12 @@ typedef struct _GUID {
std::uint8_t Data4[8];
} GUID;
-#ifndef _SYS_GUID_OPERATOR_EQ_
-#define _SYS_GUID_OPERATOR_EQ_
inline bool operator==(const GUID& lhs, const GUID& rhs) noexcept
{ return std::memcmp(&lhs, &rhs, sizeof(GUID)) == 0; }
inline bool operator!=(const GUID& lhs, const GUID& rhs) noexcept
{ return !(lhs == rhs); }
-#endif // _SYS_GUID_OPERATOR_EQ_
-#endif // GUID_DEFINED
+#endif // _WIN32
#define DECL_EQOP(T) \
friend bool operator==(const T &lhs, const T &rhs) noexcept { return std::memcmp(&lhs, &rhs, sizeof(T)) == 0; } \