diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-21 18:20:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 18:20:55 +0000 |
| commit | e12dd2975519f071ca05513927d1dabd8129d647 (patch) | |
| tree | 79987bd99e56ce48f39ed864526027934f00bcac /toolbox | |
| parent | 4dc379b59bcb60ff17501c2b7f3180fc0f6cdb61 (diff) | |
| parent | ac239a915b08823166657d6a3bfad094e57db0be (diff) | |
| download | system_core-e12dd2975519f071ca05513927d1dabd8129d647.zip system_core-e12dd2975519f071ca05513927d1dabd8129d647.tar.gz system_core-e12dd2975519f071ca05513927d1dabd8129d647.tar.bz2 | |
am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"
* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
toolbox: fix x86 build
Diffstat (limited to 'toolbox')
| -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 497db06..5712fee 100644 --- a/toolbox/grep/util.c +++ b/toolbox/grep/util.c @@ -273,7 +273,7 @@ procfile(const char *fn) return (c); } -#define iswword(x) (iswalnum((x)) || (x) == L'_') +#define iswword(x) (iswalnum((wint_t)(x)) || (x) == L'_') /* * Processes a line comparing it with the specified patterns. Each pattern @@ -323,7 +323,7 @@ procline(struct str *l, int nottext) continue; /* Check for whole word match */ if (fg_pattern[i].word && pmatch.rm_so != 0) { - wint_t wbegin, wend; + wchar_t wbegin, wend; wbegin = wend = L' '; if (pmatch.rm_so != 0 && |