compat.h: Provide char32_t on MacOS X

omf2097 · Nov 1, 2024 · 39f3151 · 39f3151
1 parent 39cd667
commit 39f3151
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/utils/compat.h b/src/utils/compat.h
@@ -4,6 +4,15 @@
 #include "platform.h"
 #include <string.h>
 
+#if __APPLE__
+// MacOS X does not ship uchar.h
+#include <stdint.h>
+typedef uint_least16_t char16_t;
+typedef uint_least32_t char32_t;
+#else
+#include <uchar.h>
+#endif
+
 #ifndef HAVE_STD_STRDUP
 char *strdup(const char *s1);
 #endif

diff --git a/src/utils/cp437.c b/src/utils/cp437.c
@@ -1,6 +1,5 @@
 #include "cp437.h"
 #include <assert.h>
-#include <uchar.h>
 
 char const *cp437_result_to_string(cp437_result result) {
     switch(result) {

diff --git a/src/utils/cp437.h b/src/utils/cp437.h
@@ -21,8 +21,8 @@
 #ifndef CP437_H
 #define CP437_H
 
-#include <stdint.h> // uint8_t
-#include <uchar.h>  // char32_t
+#include "utils/compat.h" // char32_t
+#include <stdint.h>       // uint8_t
 
 // TODO: Use warn_unused_result on these methods.
 // TODO: Maybe expand cp437_result to signal what type of invalid UTF-8 was encountered, or where the error occured?

diff --git a/testing/test_cp437.c b/testing/test_cp437.c
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 #include <locale.h>