diff options
| author | Elliott Hughes <enh@google.com> | 2016-09-17 16:40:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-17 16:40:59 +0000 |
| commit | 42743f1e9ebf0771fea41361e9424f58f8de1cde (patch) | |
| tree | 598697137f5a208256d70f133f4d635007bea5a8 /libc/tzcode/strftime.c | |
| parent | 9d4d60b4806d667741566bd4f4ad2a0225d52959 (diff) | |
| parent | a9209d7a0ee7ef40f9a14cab2b6756d7e6f8b919 (diff) | |
Merge "Fix some easy cases of __ANDROID__ versus __BIONIC__."
Diffstat (limited to 'libc/tzcode/strftime.c')
| -rw-r--r-- | libc/tzcode/strftime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/tzcode/strftime.c b/libc/tzcode/strftime.c index b1e0d1cc6..c05f6b5bd 100644 --- a/libc/tzcode/strftime.c +++ b/libc/tzcode/strftime.c @@ -39,7 +39,7 @@ #include "fcntl.h" #include "locale.h" -#if __ANDROID__ +#if defined(__BIONIC__) /* LP32 had a 32-bit time_t, so we need to work around that here. */ #if defined(__LP64__) |