commit 8fbd15a6d0818916a821bc2138208f0251c9754f
author Elliott Hughes <enh@google.com> Fri May 19 18:24:08 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 19 18:24:09 2017 +0000
tree 9c80ba145936baaddfa2d7214696adae710db015
parent f06535035ef6e48aeacc37819ea7182416275216
parent 497ad30d7d76721adab8830a76e72bcc9a840ba5

Merge "Make `union semun` usable."

libc/include/malloc.h

diff --git a/libc/include/malloc.h b/libc/include/malloc.h
index db5da04..b07a000 100644
--- a/libc/include/malloc.h
+++ b/libc/include/malloc.h
@@ -80,7 +80,7 @@
 /* mallopt options */
 #define M_DECAY_TIME -100
 
-int mallopt(int, int) __INTRODUCED_IN(26);
+int mallopt(int, int) __INTRODUCED_IN_FUTURE;
 
 __END_DECLS
 

tests/run-on-host.sh

diff --git a/tests/run-on-host.sh b/tests/run-on-host.sh
index 1f2cb96..c47bc4f 100755
--- a/tests/run-on-host.sh
+++ b/tests/run-on-host.sh
@@ -8,7 +8,6 @@
         cd ${ANDROID_BUILD_TOP}
         export ANDROID_DATA=${TARGET_OUT_DATA}
         export ANDROID_ROOT=${TARGET_OUT}
-        export LD_LIBRARY_PATH=${HOST_OUT}/obj/lib/
         ${HOST_OUT}/nativetest64/bionic-unit-tests-glibc/bionic-unit-tests-glibc $@
     )
     exit 0

tests/utils.h

diff --git a/tests/utils.h b/tests/utils.h
index e3e0b0d..81df350 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -19,7 +19,6 @@
 
 #include <inttypes.h>
 #include <sys/mman.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -46,6 +45,8 @@
 
 #if defined(__linux__)
 
+#include <sys/sysmacros.h>
+
 struct map_record {
   uintptr_t addr_start;
   uintptr_t addr_end;