From 537b7695c26b9ad83ccc13b68c78a2fb27545d7e Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 24 Jun 2014 16:21:58 -0400
Subject: Fix some warnings found by clang.

---
 libdimension/dimension.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libdimension/dimension.h')

diff --git a/libdimension/dimension.h b/libdimension/dimension.h
index b6c1559..71c68fa 100644
--- a/libdimension/dimension.h
+++ b/libdimension/dimension.h
@@ -39,7 +39,9 @@
 #ifndef DIMENSION_H
 #define DIMENSION_H
 
-#ifdef __cplusplus
+#include <dimension/compiler.h>
+
+#if DMNSN_CXX
 /* We've been included from a C++ file; mark everything here as extern "C" */
 extern "C" {
 #endif
@@ -53,7 +55,6 @@ extern "C" {
 typedef void dmnsn_callback_fn(void *ptr);
 
 /* Include all the libdimension headers */
-#include <dimension/compiler.h>
 #include <dimension/error.h>
 #include <dimension/malloc.h>
 #include <dimension/pool.h>
@@ -87,7 +88,7 @@ typedef void dmnsn_callback_fn(void *ptr);
 #include <dimension/scene.h>
 #include <dimension/ray_trace.h>
 
-#ifdef __cplusplus
+#if DMNSN_CXX
 }
 #endif
 
-- 
cgit v1.2.3