diff options
author | Christopher Ferris <cferris@google.com> | 2015-10-22 22:27:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 22:27:54 +0000 |
commit | 216bff9ff33d74fb7f232045799a93b102a4d2a2 (patch) | |
tree | 02cf208ebc4f70f8134235d155b5bf9bb640a08a /libc/upstream-netbsd/android/include/netbsd-compat.h | |
parent | 1a61896b1bc470f9377eeeafec461aba0d0dda6c (diff) | |
parent | afff4442ae092469f298a71862d61c65ceb67b03 (diff) |
resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
am: afff4442ae
* commit 'afff4442ae092469f298a71862d61c65ceb67b03':
Sync with upstream NetBSD lib/libc/regex.
Diffstat (limited to 'libc/upstream-netbsd/android/include/netbsd-compat.h')
-rw-r--r-- | libc/upstream-netbsd/android/include/netbsd-compat.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libc/upstream-netbsd/android/include/netbsd-compat.h b/libc/upstream-netbsd/android/include/netbsd-compat.h index 04bc728b5..8d1c46b22 100644 --- a/libc/upstream-netbsd/android/include/netbsd-compat.h +++ b/libc/upstream-netbsd/android/include/netbsd-compat.h @@ -31,4 +31,7 @@ #define __readlockenv() 0 #define __unlockenv() 0 +#include <stddef.h> +__LIBC_HIDDEN__ int reallocarr(void*, size_t, size_t); + #endif |