Make public headers C++-compatible

Allow `#include <SheenBidi.h>` in C++ without having to wrap it in `extern "C"`.
Tehreer · Feb 28, 2025 · 5d1135d · 5d1135d
1 parent c44eb11
commit 5d1135d
Show file tree

Hide file tree

Showing 25 changed files with 106 additions and 21 deletions.
diff --git a/Headers/SBAlgorithm.h b/Headers/SBAlgorithm.h
@@ -22,6 +22,10 @@
 #include "SBCodepointSequence.h"
 #include "SBParagraph.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _SBAlgorithm *SBAlgorithmRef;
 
 /**
@@ -116,4 +120,8 @@ SBAlgorithmRef SBAlgorithmRetain(SBAlgorithmRef algorithm);
  */
 void SBAlgorithmRelease(SBAlgorithmRef algorithm);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBBase.h b/Headers/SBBase.h
@@ -20,6 +20,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * A type to represent an 8-bit signed integer.
  */
@@ -116,4 +120,8 @@ typedef SBUInt8                     SBLevel;
  */
 #define SBLevelDefaultRTL           0xFD
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBBidiType.h b/Headers/SBBidiType.h
@@ -19,6 +19,10 @@
 
 #include "SBBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Constants that specify the bidirectional types of a character.
  */
@@ -78,4 +82,8 @@ typedef SBUInt8 SBBidiType;
  */
 #define SBBidiTypeIsFormat(t)               SBUInt8InRange(t, SBBidiTypeLRI, SBBidiTypePDF)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBCodepoint.h b/Headers/SBCodepoint.h
@@ -22,6 +22,10 @@
 #include "SBGeneralCategory.h"
 #include "SBScript.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * A type to represent a unicode code point.
  */
@@ -160,4 +164,8 @@ SBCodepoint SBCodepointDecodeNextFromUTF16(const SBUInt16 *buffer, SBUInteger le
  */
 SBCodepoint SBCodepointDecodePreviousFromUTF16(const SBUInt16 *buffer, SBUInteger length, SBUInteger *stringIndex);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBCodepointSequence.h b/Headers/SBCodepointSequence.h
@@ -20,6 +20,10 @@
 #include "SBBase.h"
 #include "SBCodepoint.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum {
     SBStringEncodingUTF8 = 0,  /**< An 8-bit representation of Unicode code points. */
     SBStringEncodingUTF16 = 1, /**< 16-bit UTF encoding in native endianness. */
@@ -63,4 +67,8 @@ SBCodepoint SBCodepointSequenceGetCodepointBefore(const SBCodepointSequence *cod
 SBCodepoint SBCodepointSequenceGetCodepointAt(const SBCodepointSequence *codepointSequence,
     SBUInteger *stringIndex);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBGeneralCategory.h b/Headers/SBGeneralCategory.h
@@ -19,6 +19,10 @@
 
 #include "SBBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Constants that specify the general category of a character.
  */
@@ -103,4 +107,8 @@ typedef SBUInt8 SBGeneralCategory;
  */
 #define SBGeneralCategoryIsOther(gc)        SBUInt8InRange(gc, SBGeneralCategoryCC, SBGeneralCategoryCN)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBLine.h b/Headers/SBLine.h
@@ -20,6 +20,10 @@
 #include "SBBase.h"
 #include "SBRun.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _SBLine *SBLineRef;
 
 /**
@@ -81,4 +85,8 @@ SBLineRef SBLineRetain(SBLineRef line);
  */
 void SBLineRelease(SBLineRef line);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBMirrorLocator.h b/Headers/SBMirrorLocator.h
@@ -21,6 +21,10 @@
 #include "SBCodepoint.h"
 #include "SBLine.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _SBMirrorLocator *SBMirrorLocatorRef;
 
 /**
@@ -100,4 +104,8 @@ SBMirrorLocatorRef SBMirrorLocatorRetain(SBMirrorLocatorRef locator);
  */
 void SBMirrorLocatorRelease(SBMirrorLocatorRef locator);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBParagraph.h b/Headers/SBParagraph.h
@@ -20,6 +20,10 @@
 #include "SBBase.h"
 #include "SBLine.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _SBParagraph *SBParagraphRef;
 
 /**
@@ -97,4 +101,8 @@ SBParagraphRef SBParagraphRetain(SBParagraphRef paragraph);
  */
 void SBParagraphRelease(SBParagraphRef paragraph);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBRun.h b/Headers/SBRun.h
@@ -19,6 +19,10 @@
 
 #include "SBBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * A structure containing the information of a sequence of characters having the same embedding
  * level.
@@ -29,4 +33,8 @@ typedef struct _SBRun {
     SBLevel level;     /**< The embedding level of the run. */
 } SBRun;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBScript.h b/Headers/SBScript.h
@@ -19,6 +19,10 @@
 
 #include "SBBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Constants that specify the script of a character.
  */
@@ -264,4 +268,8 @@ typedef SBUInt8 SBScript;
  */
 SBUInt32 SBScriptGetOpenTypeTag(SBScript script);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Headers/SBScriptLocator.h b/Headers/SBScriptLocator.h
@@ -21,6 +21,10 @@
 #include "SBCodepointSequence.h"
 #include "SBScript.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _SBScriptLocator *SBScriptLocatorRef;
 
 /**
@@ -98,4 +102,8 @@ SBScriptLocatorRef SBScriptLocatorRetain(SBScriptLocatorRef locator);
  */
 void SBScriptLocatorRelease(SBScriptLocatorRef locator);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Tools/Tester/AlgorithmTester.cpp b/Tools/Tester/AlgorithmTester.cpp
@@ -20,9 +20,7 @@
 #include <string>
 #include <vector>
 
-extern "C" {
 #include <SheenBidi.h>
-}
 
 #include <Parser/BidiTest.h>
 #include <Parser/BidiBrackets.h>

diff --git a/Tools/Tester/AlgorithmTester.h b/Tools/Tester/AlgorithmTester.h
@@ -20,9 +20,7 @@
 #include <cstdint>
 #include <vector>
 
-extern "C" {
 #include <SheenBidi.h>
-}
 
 #include <Parser/BidiTest.h>
 #include <Parser/BidiCharacterTest.h>

diff --git a/Tools/Tester/BidiTypeLookupTester.cpp b/Tools/Tester/BidiTypeLookupTester.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBase.h>
 #include <Headers/SBBidiType.h>
 #include <Headers/SBConfig.h>
+
+extern "C" {
 #include <Source/BidiTypeLookup.h>
 }
 

diff --git a/Tools/Tester/BracketLookupTester.cpp b/Tools/Tester/BracketLookupTester.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBase.h>
 #include <Headers/SBConfig.h>
+
+extern "C" {
 #include <Source/BracketType.h>
 #include <Source/PairingLookup.h>
 }

diff --git a/Tools/Tester/CodepointSequenceTester.cpp b/Tools/Tester/CodepointSequenceTester.cpp
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <SBBase.h>
 #include <SBCodepointSequence.h>
-}
 
 #include <cassert>
 #include <vector>

diff --git a/Tools/Tester/Configuration.cpp b/Tools/Tester/Configuration.cpp
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <SBConfig.h>
-}
 
 #include "Configuration.h"
 

diff --git a/Tools/Tester/GeneralCategoryLookupTester.cpp b/Tools/Tester/GeneralCategoryLookupTester.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBase.h>
 #include <Headers/SBConfig.h>
 #include <Headers/SBGeneralCategory.h>
+
+extern "C" {
 #include <Source/GeneralCategoryLookup.h>
 }
 

diff --git a/Tools/Tester/MirrorLookupTester.cpp b/Tools/Tester/MirrorLookupTester.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBase.h>
 #include <Headers/SBConfig.h>
+
+extern "C" {
 #include <Source/PairingLookup.h>
 }
 

diff --git a/Tools/Tester/ScriptLocatorTester.cpp b/Tools/Tester/ScriptLocatorTester.cpp
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBase.h>
 #include <Headers/SBCodepointSequence.h>
 #include <Headers/SBScript.h>
 #include <Headers/SBScriptLocator.h>
-}
 
 #include <cassert>
 #include <string>

diff --git a/Tools/Tester/ScriptLookupTester.cpp b/Tools/Tester/ScriptLookupTester.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBase.h>
 #include <Headers/SBConfig.h>
+
+extern "C" {
 #include <Source/ScriptLookup.h>
 }
 

diff --git a/Tools/Tester/Utilities/Convert.cpp b/Tools/Tester/Utilities/Convert.cpp
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SBBidiType.h>
 #include <Headers/SBGeneralCategory.h>
 #include <Headers/SBScript.h>
-}
 
 #include <cstdint>
 #include <map>

diff --git a/Tools/Tester/Utilities/Convert.h b/Tools/Tester/Utilities/Convert.h
@@ -20,11 +20,9 @@
 #include <cstdint>
 #include <string>
 
-extern "C" {
 #include <Headers/SBBidiType.h>
 #include <Headers/SBGeneralCategory.h>
 #include <Headers/SBScript.h>
-}
 
 namespace SheenBidi {
 namespace Tester {

diff --git a/Tools/Tester/main.cpp b/Tools/Tester/main.cpp
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-extern "C" {
 #include <Headers/SheenBidi.h>
-}
 
 #include <iostream>