From 30821e978b69fa017cbcd76e5ff25c62f16b1d2a Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 9 Mar 2018 17:24:03 -0800
Subject: Add extern "C" to some headers
---
OpenAL32/Include/alMain.h | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
(limited to 'OpenAL32/Include')
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 6d6d661f..783a90de 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -49,19 +49,6 @@
#define UNLIKELY(x) (!!(x))
#endif
-typedef ALint64SOFT ALint64;
-typedef ALuint64SOFT ALuint64;
-
-#ifndef U64
-#if defined(_MSC_VER)
-#define U64(x) ((ALuint64)(x##ui64))
-#elif SIZEOF_LONG == 8
-#define U64(x) ((ALuint64)(x##ul))
-#elif SIZEOF_LONG_LONG == 8
-#define U64(x) ((ALuint64)(x##ull))
-#endif
-#endif
-
#ifndef UINT64_MAX
#define UINT64_MAX U64(18446744073709551615)
#endif
@@ -85,6 +72,23 @@ typedef ALuint64SOFT ALuint64;
#define FAM_SIZE(T, M, N) (offsetof(T, M) + sizeof(((T*)NULL)->M[0])*(N))
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef ALint64SOFT ALint64;
+typedef ALuint64SOFT ALuint64;
+
+#ifndef U64
+#if defined(_MSC_VER)
+#define U64(x) ((ALuint64)(x##ui64))
+#elif SIZEOF_LONG == 8
+#define U64(x) ((ALuint64)(x##ul))
+#elif SIZEOF_LONG_LONG == 8
+#define U64(x) ((ALuint64)(x##ull))
+#endif
+#endif
+
/* Define a CTZ64 macro (count trailing zeros, for 64-bit integers). The result
* is *UNDEFINED* if the value is 0.
*/
@@ -153,10 +157,6 @@ static const union {
#define COUNTOF(x) (sizeof(x) / sizeof(0[x]))
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct ll_ringbuffer;
struct Hrtf;
struct HrtfEntry;
--
cgit v1.2.3