| commit | 5e465f76443fe804418e335c124d274dd479079d | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 31 18:32:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 18:32:26 2017 +0000 |
| tree | 89f13adfb15991fe39289c9a12039842583ae956 | |
| parent | be5bc2b8ad3a07388ac77ca9ae626e8f8c00bf42 [diff] | |
| parent | bf52fee21434609b4da46304d8407fc5844213dc [diff] |
Merge "Revert "Make mallopt available in the future."" am: 8f7a987cd0 am: bf52fee214 Change-Id: I318f22e95f2ef59b240bf5b8bfc87eb0babb2d98
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