summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-07-12 19:36:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-12 19:36:58 +0000
commit611dceecd57ab651514942823cd1eb4a10b8a9fb (patch)
treec7df8e6b174387d649c36e4e56c4bd06991fba18 /toolbox
parentc785caa4b44a1a96e21904fac8cf857f2d9f5e96 (diff)
parentce61f74f153c7d185d1a3d5e2d6dc02ccf768963 (diff)
downloadsystem_core-611dceecd57ab651514942823cd1eb4a10b8a9fb.zip
system_core-611dceecd57ab651514942823cd1eb4a10b8a9fb.tar.gz
system_core-611dceecd57ab651514942823cd1eb4a10b8a9fb.tar.bz2
am ce61f74f: am 56cbd19b: Merge "Fix build."
* commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963': Fix build.
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/grep/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolbox/grep/util.c b/toolbox/grep/util.c
index c1c17e4..ecd948d 100644
--- a/toolbox/grep/util.c
+++ b/toolbox/grep/util.c
@@ -324,7 +324,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 &&