ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 76d057b9: Merge "toolbox: fix x86 build"

Browse source 
* commit '76d057b9708f92662a3002cffd55ecc05a860df4':
  toolbox: fix x86 build
This commit is contained in:
Greg Hackmann 2014-05-21 18:13:18 +00:00 • committed by Android Git Automerger
commit 376aebdc9d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toolbox/grep/util.c
View file

@ -273,7 +273,7 @@ procfile(const char *fn)
return (c); 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 * Processes a line comparing it with the specified patterns. Each pattern
@ -323,7 +323,7 @@ procline(struct str *l, int nottext)
continue; continue;
/* Check for whole word match */ /* Check for whole word match */
if (fg_pattern[i].word && pmatch.rm_so != 0) { if (fg_pattern[i].word && pmatch.rm_so != 0) {
wint_t wbegin, wend; wchar_t wbegin, wend;
wbegin = wend = L' '; wbegin = wend = L' ';
if (pmatch.rm_so != 0 && if (pmatch.rm_so != 0 &&