| commit | c39af283fecf7bb095e51ffea6bfb27182ce3fc4 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed May 31 18:36:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 18:36:20 2017 +0000 |
| tree | ec07f6158666cafcbf305bdf7f6c483a0f40771d | |
| parent | 5a8aff819e41df12d1ee005d9c3604ffe1640e98 [diff] | |
| parent | 5e465f76443fe804418e335c124d274dd479079d [diff] |
Merge "Revert "Make mallopt available in the future."" am: 8f7a987cd0 am: bf52fee214 am: 5e465f7644 Change-Id: I81ea1202bfbb8614c5662f7b72bded35716ab4ef
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