summaryrefslogtreecommitdiffstats
path: root/toolbox/upstream-netbsd
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 18:50:14 -0800
committerElliott Hughes <enh@google.com>2015-02-04 18:50:14 -0800
commitd20218e05dfd54620999f1fd9cb7aaa91a296be5 (patch)
treef3713125da3afebf61ed7f3b5ae4055b9836ae6f /toolbox/upstream-netbsd
parent1dee489ceaa9dfb6b6609f97380f20b0753eb2c1 (diff)
downloadsystem_core-d20218e05dfd54620999f1fd9cb7aaa91a296be5.zip
system_core-d20218e05dfd54620999f1fd9cb7aaa91a296be5.tar.gz
system_core-d20218e05dfd54620999f1fd9cb7aaa91a296be5.tar.bz2
Build BSD grep separately from toolbox.
Also move the dd-only library code into the dd section (so a future maintainer will know to keep/remove them as a block) and fix the one build warning remaining. Change-Id: Ibf6b28ef05e4cbb70b9308b0f4387f5af5b7fa94
Diffstat (limited to 'toolbox/upstream-netbsd')
-rw-r--r--toolbox/upstream-netbsd/usr.bin/grep/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/toolbox/upstream-netbsd/usr.bin/grep/file.c b/toolbox/upstream-netbsd/usr.bin/grep/file.c
index da03d71..cf4a0fa 100644
--- a/toolbox/upstream-netbsd/usr.bin/grep/file.c
+++ b/toolbox/upstream-netbsd/usr.bin/grep/file.c
@@ -78,7 +78,9 @@ static inline int
grep_refill(struct file *f)
{
ssize_t nr;
+#ifndef __ANDROID__
int bzerr;
+#endif
bufpos = buffer;
bufrem = 0;