| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Mon, 10 Sep 2018 09:13:38 +0800 |
| 4 | Subject: [PATCH] Fix build when xlocale disabled |
| 5 | |
| 6 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
| 7 | |
| 8 | Update patch to version 1.6.6 |
| 9 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 10 | Upstream-Status: Pending |
| 11 | --- |
| 12 | src/Font.c | 4 ++++ |
| 13 | 1 file changed, 4 insertions(+) |
| 14 | |
| 15 | diff --git a/src/Font.c b/src/Font.c |
| 16 | index a73f9b1..8f4d210 100644 |
| 17 | --- a/src/Font.c |
| 18 | +++ b/src/Font.c |
| 19 | @@ -675,7 +675,11 @@ int _XF86LoadQueryLocaleFont( |
| 20 | } |
| 21 | if (l - 2 - (p - charset) < 0) |
| 22 | return 0; |
| 23 | +#ifdef XLOCALE |
| 24 | if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) |
| 25 | +#else |
| 26 | + if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) |
| 27 | +#endif |
| 28 | return 0; |
| 29 | if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) |
| 30 | return 0; |
| 31 | -- |
| 32 | 2.7.4 |
| 33 | |