| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From ea4caaa1c6a6dc682bb04548ab05c5c73d0b45d6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 26 Feb 2018 15:34:52 +0800 |
| 4 | Subject: [PATCH 10/31] check for uchar.h in meson.build |
| 5 | |
| 6 | Use #if HAVE_UCHAR_H to include uchar.h conditionally. |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 12 | --- |
| 13 | meson.build | 1 + |
| 14 | src/basic/missing.h | 2 ++ |
| 15 | 2 files changed, 3 insertions(+) |
| 16 | |
| 17 | diff --git a/meson.build b/meson.build |
| 18 | index 9c25022a4..94a16712b 100644 |
| 19 | --- a/meson.build |
| 20 | +++ b/meson.build |
| 21 | @@ -623,6 +623,7 @@ foreach header : ['crypt.h', |
| 22 | 'sys/auxv.h', |
| 23 | 'valgrind/memcheck.h', |
| 24 | 'valgrind/valgrind.h', |
| 25 | + 'uchar.h', |
| 26 | ] |
| 27 | |
| 28 | conf.set10('HAVE_' + header.underscorify().to_upper(), |
| 29 | diff --git a/src/basic/missing.h b/src/basic/missing.h |
| 30 | index 39c1fb700..84d6d9167 100644 |
| 31 | --- a/src/basic/missing.h |
| 32 | +++ b/src/basic/missing.h |
| 33 | @@ -38,7 +38,9 @@ |
| 34 | #include <sys/resource.h> |
| 35 | #include <sys/socket.h> |
| 36 | #include <sys/syscall.h> |
| 37 | +#if HAVE_UCHAR_H |
| 38 | #include <uchar.h> |
| 39 | +#endif |
| 40 | #include <unistd.h> |
| 41 | |
| 42 | #if HAVE_AUDIT |
| 43 | -- |
| 44 | 2.13.0 |
| 45 | |