aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-05-29 04:22:30 -0700
committerChris Robinson <[email protected]>2014-05-29 04:22:30 -0700
commit1d45c439b83565699a1fc220dc7f34c9ceb11a7e (patch)
tree2a1e92e023d270a30da1dc1b06b3bdb205fe6462 /include
parent73614f228eda86e9dc074540989a11a4fd7fb9e9 (diff)
Add extern "C" to common headers.
Diffstat (limited to 'include')
-rw-r--r--include/atomic.h7
-rw-r--r--include/rwlock.h8
-rw-r--r--include/threads.h7
-rw-r--r--include/uintmap.h8
4 files changed, 30 insertions, 0 deletions
diff --git a/include/atomic.h b/include/atomic.h
index 87a02f7b..4adb7a94 100644
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -3,6 +3,9 @@
#include "static_assert.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef void *volatile XchgPtr;
@@ -198,4 +201,8 @@ inline void *CompExchangePtr(XchgPtr *ptr, void *oldval, void *newval)
#error "No atomic functions available on this platform!"
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* AL_ATOMIC_H */
diff --git a/include/rwlock.h b/include/rwlock.h
index c3a275e6..03482515 100644
--- a/include/rwlock.h
+++ b/include/rwlock.h
@@ -4,6 +4,10 @@
#include "bool.h"
#include "atomic.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct {
RefCount read_count;
RefCount write_count;
@@ -19,4 +23,8 @@ void ReadUnlock(RWLock *lock);
void WriteLock(RWLock *lock);
void WriteUnlock(RWLock *lock);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* AL_RWLOCK_H */
diff --git a/include/threads.h b/include/threads.h
index 4a974b53..cde4b91f 100644
--- a/include/threads.h
+++ b/include/threads.h
@@ -3,6 +3,9 @@
#include <time.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
enum {
althrd_success = 0,
@@ -227,4 +230,8 @@ int altimespec_get(struct timespec *ts, int base);
void al_nssleep(time_t sec, long nsec);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* AL_THREADS_H */
diff --git a/include/uintmap.h b/include/uintmap.h
index 611ed39b..2c4c5e7a 100644
--- a/include/uintmap.h
+++ b/include/uintmap.h
@@ -4,6 +4,10 @@
#include "AL/al.h"
#include "rwlock.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct UIntMap {
struct {
ALuint key;
@@ -32,4 +36,8 @@ inline void LockUIntMapWrite(UIntMap *map)
inline void UnlockUIntMapWrite(UIntMap *map)
{ WriteUnlock(&map->lock); }
+#ifdef __cplusplus
+}
+#endif
+
#endif /* AL_UINTMAP_H */