From 89e806e1a63fb57e875a0e7051877de436dd2e00 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 12 Feb 2016 17:02:13 +0100
Subject: systemd: don't use <uchar.h>

Not around on Ubuntu 12.04. Define the char16_t and char32_t types
ourselves.

Fixes: 2835934244e6f3b1d54315d2e1809af4d78ee877
---
 src/systemd/nm-sd-adapt.h      | 6 ++++++
 src/systemd/src/basic/escape.h | 2 ++
 src/systemd/src/basic/utf8.h   | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h
index 967cb48fac..84a497caf3 100644
--- a/src/systemd/nm-sd-adapt.h
+++ b/src/systemd/nm-sd-adapt.h
@@ -114,6 +114,12 @@ G_STMT_START { \
 
 /*****************************************************************************/
 
+/* work around missing uchar.h */
+typedef guint16 char16_t;
+typedef guint32 char32_t;
+
+/*****************************************************************************/
+
 /* Can't include both net/if.h and linux/if.h; so have to define this here */
 #ifndef IFNAMSIZ
 #define IFNAMSIZ 16
diff --git a/src/systemd/src/basic/escape.h b/src/systemd/src/basic/escape.h
index 6ca36a75e5..9f1bb45f77 100644
--- a/src/systemd/src/basic/escape.h
+++ b/src/systemd/src/basic/escape.h
@@ -25,7 +25,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#if 0 /* NM_IGNORED */
 #include <uchar.h>
+#endif /* NM_IGNORED */
 
 #include "string-util.h"
 #if 0 /* NM_IGNORED */
diff --git a/src/systemd/src/basic/utf8.h b/src/systemd/src/basic/utf8.h
index 0a7858ca67..8b917cb03e 100644
--- a/src/systemd/src/basic/utf8.h
+++ b/src/systemd/src/basic/utf8.h
@@ -24,7 +24,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#if 0 /* NM_IGNORED */
 #include <uchar.h>
+#endif /* NM_IGNORED */
 
 #include "macro.h"
 #if 0 /* NM_IGNORED */
-- 
cgit v1.2.1