am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"

* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
  toolbox: fix x86 build
This commit is contained in:
Greg Hackmann 2014-05-21 18:20:55 +00:00 committed by Android Git Automerger
commit e12dd29755

View file

@ -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 &&