| commit | d871567a7ebfaa6198c9015ff2cb30d6b78431b6 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 31 18:57:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 18:57:53 2017 +0000 |
| tree | 765d5deb6c3297a0e6c16297e3f8e3963cd6f6a1 | |
| parent | 15cc0aff7288d1f77bdd16689fdbfa0b2c28ccc1 [diff] | |
| parent | c39af283fecf7bb095e51ffea6bfb27182ce3fc4 [diff] |
Merge "Revert "Make mallopt available in the future."" am: 8f7a987cd0 am: bf52fee214 am: 5e465f7644 am: c39af283fe Change-Id: I3e1bf1f0fc8abbbb58e52fa7afcbafa0bdbd5efb
diff --git a/libc/include/malloc.h b/libc/include/malloc.h index b07a000..db5da04 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_FUTURE; +int mallopt(int, int) __INTRODUCED_IN(26); __END_DECLS