summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-10-22 22:15:26 -0700
committerAndreas Gampe <agampe@google.com>2015-10-22 22:15:26 -0700
commit807032d0e12877a4c92ac7f6072d5dd9e1f76f3c (patch)
tree02f236c0854b792015c9e0deea628b11af47e275
parent43b1f823b5a739437cbe14e24d8449028e3c8f6e (diff)
parent216bff9ff33d74fb7f232045799a93b102a4d2a2 (diff)
downloadbionic-807032d0e12877a4c92ac7f6072d5dd9e1f76f3c.zip
bionic-807032d0e12877a4c92ac7f6072d5dd9e1f76f3c.tar.gz
bionic-807032d0e12877a4c92ac7f6072d5dd9e1f76f3c.tar.bz2
resolve merge conflicts of 216bff9ff3 to mnc-dr-dev.
Change-Id: I63c4f3a4e56f30d6f476ad2c623c23ee7e1a3778
-rw-r--r--libc/upstream-netbsd/android/include/netbsd-compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/upstream-netbsd/android/include/netbsd-compat.h b/libc/upstream-netbsd/android/include/netbsd-compat.h
index 0212d16..8d1c46b 100644
--- a/libc/upstream-netbsd/android/include/netbsd-compat.h
+++ b/libc/upstream-netbsd/android/include/netbsd-compat.h
@@ -32,6 +32,6 @@
#define __unlockenv() 0
#include <stddef.h>
-int reallocarr(void*, size_t, size_t);
+__LIBC_HIDDEN__ int reallocarr(void*, size_t, size_t);
#endif