diff options
author | Greg Hackmann | 2014-05-21 13:10:31 -0500 |
---|---|---|
committer | Gerrit Code Review | 2014-05-21 13:10:31 -0500 |
commit | 76d057b9708f92662a3002cffd55ecc05a860df4 (patch) | |
tree | 348c27670eb48f64c49d6f3e14e7f1940e879af1 | |
parent | 5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3 (diff) | |
parent | 2122aac5c94fc53ae57b26542a468fa16d348a7b (diff) | |
download | platform-system-core-76d057b9708f92662a3002cffd55ecc05a860df4.tar.gz platform-system-core-76d057b9708f92662a3002cffd55ecc05a860df4.tar.xz platform-system-core-76d057b9708f92662a3002cffd55ecc05a860df4.zip |
Merge "toolbox: fix x86 build"
-rw-r--r-- | toolbox/grep/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolbox/grep/util.c b/toolbox/grep/util.c index 497db060d..5712feeac 100644 --- a/toolbox/grep/util.c +++ b/toolbox/grep/util.c | |||
@@ -273,7 +273,7 @@ procfile(const char *fn) | |||
273 | return (c); | 273 | return (c); |
274 | } | 274 | } |
275 | 275 | ||
276 | #define iswword(x) (iswalnum((x)) || (x) == L'_') | 276 | #define iswword(x) (iswalnum((wint_t)(x)) || (x) == L'_') |
277 | 277 | ||
278 | /* | 278 | /* |
279 | * Processes a line comparing it with the specified patterns. Each pattern | 279 | * Processes a line comparing it with the specified patterns. Each pattern |
@@ -323,7 +323,7 @@ procline(struct str *l, int nottext) | |||
323 | continue; | 323 | continue; |
324 | /* Check for whole word match */ | 324 | /* Check for whole word match */ |
325 | if (fg_pattern[i].word && pmatch.rm_so != 0) { | 325 | if (fg_pattern[i].word && pmatch.rm_so != 0) { |
326 | wint_t wbegin, wend; | 326 | wchar_t wbegin, wend; |
327 | 327 | ||
328 | wbegin = wend = L' '; | 328 | wbegin = wend = L' '; |
329 | if (pmatch.rm_so != 0 && | 329 | if (pmatch.rm_so != 0 && |