From 5fea511ccec500f575898df33e9934dec075527c Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 29 Oct 2018 11:51:41 -0700
Subject: [PATCH] Fix some more headers for C++

---
 common/align.h         | 2 +-
 common/bool.h          | 2 +-
 common/static_assert.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/align.h b/common/align.h
index a5d8a20c..53a5806a 100644
--- a/common/align.h
+++ b/common/align.h
@@ -5,7 +5,7 @@
 #include <stdalign.h>
 #endif
 
-#ifndef alignas
+#if !defined(alignas) && !defined(__cplusplus)
 #if defined(HAVE_C11_ALIGNAS)
 #define alignas _Alignas
 #else
diff --git a/common/bool.h b/common/bool.h
index dbb28e15..eb1d9174 100644
--- a/common/bool.h
+++ b/common/bool.h
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #endif
 
-#if !defined(__cplusplus) && !defined(bool)
+#if !defined(bool) && !defined(__cplusplus)
 #ifdef HAVE_C99_BOOL
 #define bool _Bool
 #else
diff --git a/common/static_assert.h b/common/static_assert.h
index bf0ce065..3a554fb5 100644
--- a/common/static_assert.h
+++ b/common/static_assert.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 
-#ifndef static_assert
+#if !defined(static_assert) && !defined(__cplusplus)
 #ifdef HAVE_C11_STATIC_ASSERT
 #define static_assert _Static_assert
 #else