From 52dc39a5537432c34cd1cdd17faf10fff77bb86f Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 18 Apr 2018 00:54:24 -0400
Subject: [PATCH] Decided to keep attrstr.h for now; removed extern "C" hack
 from attrstr.hpp on Windows and moved it into attrstr.h. Let's merge back.

---
 common/attrstr.h    | 8 ++++++++
 windows/attrstr.hpp | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/attrstr.h b/common/attrstr.h
index 475589f3..69ada5c1 100644
--- a/common/attrstr.h
+++ b/common/attrstr.h
@@ -1,5 +1,9 @@
 // 19 february 2018
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // attribute.c
 extern uiAttribute *uiprivAttributeRetain(uiAttribute *a);
 extern void uiprivAttributeRelease(uiAttribute *a);
@@ -36,3 +40,7 @@ struct uiprivGraphemes {
 };
 extern int uiprivGraphemesTakesUTF16(void);
 extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/windows/attrstr.hpp b/windows/attrstr.hpp
index 449000ed..bd522ca1 100644
--- a/windows/attrstr.hpp
+++ b/windows/attrstr.hpp
@@ -1,7 +1,5 @@
 // 11 march 2018
-extern "C" {
 #include "../common/attrstr.h"
-}
 
 // dwrite.cpp
 extern IDWriteFactory *dwfactory;