diff options
Diffstat (limited to 'patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch')
| -rw-r--r-- | patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch | 152 |
1 files changed, 0 insertions, 152 deletions
diff --git a/patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch b/patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch deleted file mode 100644 index db5a28a9c..000000000 --- a/patches/systemd-234/0009-HACK-add-local-copy-of-uchar.h.patch +++ /dev/null @@ -1,152 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 15 Apr 2016 16:33:14 +0200 -Subject: [PATCH] HACK: add local copy of uchar.h - -Upstream requires glibc 2.16 and uchar.h is available in that version. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - configure.ac | 1 + - src/basic/_uchar.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/basic/escape.h | 1 - - src/basic/missing.h | 4 +++ - src/basic/utf8.h | 1 - - 5 files changed, 83 insertions(+), 2 deletions(-) - create mode 100644 src/basic/_uchar.h - -diff --git a/configure.ac b/configure.ac -index 2101755d4e58..335a718ad2c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -317,6 +317,7 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n - AC_CHECK_HEADERS([linux/btrfs.h], [], []) - AC_CHECK_HEADERS([linux/memfd.h], [], []) - AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [#include <sys/socket.h>]) -+AC_CHECK_HEADERS([uchar.h], [], []) - - # unconditionally pull-in librt with old glibc versions - AC_SEARCH_LIBS([clock_gettime], [rt], [], []) -diff --git a/src/basic/_uchar.h b/src/basic/_uchar.h -new file mode 100644 -index 000000000000..b15d355ae0c5 ---- /dev/null -+++ b/src/basic/_uchar.h -@@ -0,0 +1,78 @@ -+/* Copyright (C) 2011-2015 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+/* -+ * ISO C11 Standard: 7.28 -+ * Unicode utilities <uchar.h> -+ */ -+ -+#ifndef _UCHAR_H -+#define _UCHAR_H 1 -+ -+#include <features.h> -+ -+#define __need_size_t -+#include <stddef.h> -+#define __need_mbstate_t -+#include <wchar.h> -+ -+/* Public type. */ -+typedef __mbstate_t mbstate_t; -+ -+ -+#if defined __GNUC__ && !defined __USE_ISOCXX11 -+/* Define the 16-bit and 32-bit character types. Use the information -+ provided by the compiler. */ -+# if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__ -+# if defined __STDC_VERSION__ && __STDC_VERSION__ < 201000L -+# error "<uchar.h> requires ISO C11 mode" -+# else -+# error "definitions of __CHAR16_TYPE__ and/or __CHAR32_TYPE__ missing" -+# endif -+# endif -+typedef __CHAR16_TYPE__ char16_t; -+typedef __CHAR32_TYPE__ char32_t; -+#endif -+ -+ -+__BEGIN_DECLS -+ -+/* Write char16_t representation of multibyte character pointed -+ to by S to PC16. */ -+extern size_t mbrtoc16 (char16_t *__restrict __pc16, -+ const char *__restrict __s, size_t __n, -+ mbstate_t *__restrict __p) __THROW; -+ -+/* Write multibyte representation of char16_t C16 to S. */ -+extern size_t c16rtomb (char *__restrict __s, char16_t __c16, -+ mbstate_t *__restrict __ps) __THROW; -+ -+ -+ -+/* Write char32_t representation of multibyte character pointed -+ to by S to PC32. */ -+extern size_t mbrtoc32 (char32_t *__restrict __pc32, -+ const char *__restrict __s, size_t __n, -+ mbstate_t *__restrict __p) __THROW; -+ -+/* Write multibyte representation of char32_t C32 to S. */ -+extern size_t c32rtomb (char *__restrict __s, char32_t __c32, -+ mbstate_t *__restrict __ps) __THROW; -+ -+__END_DECLS -+ -+#endif /* uchar.h */ -diff --git a/src/basic/escape.h b/src/basic/escape.h -index 6f5cc60bc80d..d2edac9ccdce 100644 ---- a/src/basic/escape.h -+++ b/src/basic/escape.h -@@ -23,7 +23,6 @@ - #include <stddef.h> - #include <stdint.h> - #include <sys/types.h> --#include <uchar.h> - - #include "string-util.h" - #include "missing.h" -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 975d6054c5ce..a7f53e4622af 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -37,7 +37,11 @@ - #include <sys/resource.h> - #include <sys/socket.h> - #include <sys/syscall.h> -+#ifdef HAVE_UCHAR_H - #include <uchar.h> -+#else -+#include "_uchar.h" -+#endif - #include <unistd.h> - - #ifdef HAVE_AUDIT -diff --git a/src/basic/utf8.h b/src/basic/utf8.h -index f9b9c9468bb1..6ac9a3c8d087 100644 ---- a/src/basic/utf8.h -+++ b/src/basic/utf8.h -@@ -22,7 +22,6 @@ - #include <stdbool.h> - #include <stddef.h> - #include <stdint.h> --#include <uchar.h> - - #include "macro.h" - #include "missing.h" |