From 38e0c63d7252c7fe9a21d3f01b37316eea94ad61 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 4 Dec 2018 08:08:15 +0100
Subject: [PATCH] missing: move char{16,32}_t definitions to missing_type.h

---
 src/basic/escape.h       |  2 +-
 src/basic/meson.build    |  1 +
 src/basic/missing.h      | 10 +---------
 src/basic/missing_type.h | 12 ++++++++++++
 src/basic/utf8.h         |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 src/basic/missing_type.h

diff --git a/src/basic/escape.h b/src/basic/escape.h
index 2e07c73b9e..515620993d 100644
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -8,7 +8,7 @@
 #include <uchar.h>
 
 #include "string-util.h"
-#include "missing.h"
+#include "missing_type.h"
 
 /* What characters are special in the shell? */
 /* must be escaped outside and inside double-quotes */
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 8670bc962f..153a38f9d0 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -108,6 +108,7 @@ basic_sources = files('''
         missing_securebits.h
         missing_stat.h
         missing_syscall.h
+        missing_type.h
         missing_vxcan.h
         mkdir-label.c
         mkdir.c
diff --git a/src/basic/missing.h b/src/basic/missing.h
index 0f3c59d897..e3ee46bcce 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -14,7 +14,6 @@
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/syscall.h>
-#include <uchar.h>
 #include <unistd.h>
 
 #if HAVE_AUDIT
@@ -278,14 +277,6 @@ struct sockaddr_vm {
 #define KCMP_FILE 0
 #endif
 
-#if !HAVE_CHAR32_T
-#define char32_t uint32_t
-#endif
-
-#if !HAVE_CHAR16_T
-#define char16_t uint16_t
-#endif
-
 #ifndef ETHERTYPE_LLDP
 #define ETHERTYPE_LLDP 0x88cc
 #endif
@@ -331,5 +322,6 @@ struct sockaddr_vm {
 #include "missing_magic.h"
 #include "missing_network.h"
 #include "missing_prctl.h"
+#include "missing_type.h"
 
 #include "missing_syscall.h"
diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
new file mode 100644
index 0000000000..bf8a6caa1b
--- /dev/null
+++ b/src/basic/missing_type.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include <uchar.h>
+
+#if !HAVE_CHAR32_T
+#define char32_t uint32_t
+#endif
+
+#if !HAVE_CHAR16_T
+#define char16_t uint16_t
+#endif
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index 3de798050d..628456936e 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -7,7 +7,7 @@
 #include <uchar.h>
 
 #include "macro.h"
-#include "missing.h"
+#include "missing_type.h"
 
 #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
 #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf"