diff options
| author | Elliott Hughes <enh@google.com> | 2019-03-29 13:39:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-29 13:39:41 -0700 |
| commit | d4952191e4a16a7c29e0b2952d71fd86334bf48c (patch) | |
| tree | 818308423a4b5cb604e41b2bba846102949d6e3a /toolbox/upstream-netbsd/usr.bin/grep/grep.h | |
| parent | f33436d7208e35f640d058f6cf9a1ca8b71d1849 (diff) | |
| parent | 0b2474d84fba8c038d174ee13022d0234e2d1f1e (diff) | |
Merge "BSD grep: sync with upstream." am: a42823b264 am: 1a420368d8
am: 0b2474d84f
Change-Id: I02cc77ba673fd298623f44164da7b2b0957d9000
Diffstat (limited to 'toolbox/upstream-netbsd/usr.bin/grep/grep.h')
| -rw-r--r-- | toolbox/upstream-netbsd/usr.bin/grep/grep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolbox/upstream-netbsd/usr.bin/grep/grep.h b/toolbox/upstream-netbsd/usr.bin/grep/grep.h index fa2a3e3ce6..b7ef7fa35a 100644 --- a/toolbox/upstream-netbsd/usr.bin/grep/grep.h +++ b/toolbox/upstream-netbsd/usr.bin/grep/grep.h @@ -1,4 +1,4 @@ -/* $NetBSD: grep.h,v 1.8 2012/05/06 22:27:00 joerg Exp $ */ +/* $NetBSD: grep.h,v 1.10 2018/08/12 09:03:21 christos Exp $ */ /* $OpenBSD: grep.h,v 1.15 2010/04/05 03:03:55 tedu Exp $ */ /* $FreeBSD: head/usr.bin/grep/grep.h 211496 2010-08-19 09:28:59Z des $ */ @@ -29,14 +29,14 @@ * SUCH DAMAGE. */ -#ifndef __ANDROID__ +#ifndef WITHOUT_BZ2 #include <bzlib.h> #endif #include <limits.h> #include <regex.h> #include <stdbool.h> #include <stdio.h> -#ifndef __ANDROID__ +#ifndef WITHOUT_GZIP #include <zlib.h> #endif |