diff options
| author | Dan Albert <danalbert@google.com> | 2015-01-30 17:18:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-30 17:18:49 +0000 |
| commit | 94335cc8e2f32638d9e38741ddabfd19a38e0840 (patch) | |
| tree | 02269c699fdbd5ee653ecebe86da298e2c68df92 /libc/include/stdlib.h | |
| parent | 542b94d9bf7eb3838b0582c02d7a1bf2e270af5a (diff) | |
| parent | 466dbe444446da0a8729ae9ac7294f54276e29d7 (diff) | |
| download | android_bionic-94335cc8e2f32638d9e38741ddabfd19a38e0840.tar.gz android_bionic-94335cc8e2f32638d9e38741ddabfd19a38e0840.tar.bz2 android_bionic-94335cc8e2f32638d9e38741ddabfd19a38e0840.zip | |
Merge "Put back inline definitions if using an old API."
Diffstat (limited to 'libc/include/stdlib.h')
| -rw-r--r-- | libc/include/stdlib.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h index dca447418..cbd7aeb98 100644 --- a/libc/include/stdlib.h +++ b/libc/include/stdlib.h @@ -76,10 +76,10 @@ extern unsigned long long strtoull(const char *, char **, int); extern int posix_memalign(void **memptr, size_t alignment, size_t size); -extern double atof(const char*); +_BIONIC_NOT_BEFORE_21(extern double atof(const char*);) extern double strtod(const char*, char**) __LIBC_ABI_PUBLIC__; -extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__; +_BIONIC_NOT_BEFORE_21(extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__;) extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__; extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__; @@ -90,9 +90,9 @@ extern int atoi(const char*) __purefunc; extern long atol(const char*) __purefunc; extern long long atoll(const char*) __purefunc; -extern int abs(int) __pure2; -extern long labs(long) __pure2; -extern long long llabs(long long) __pure2; +_BIONIC_NOT_BEFORE_21(extern int abs(int) __pure2;) +_BIONIC_NOT_BEFORE_21(extern long labs(long) __pure2;) +_BIONIC_NOT_BEFORE_21(extern long long llabs(long long) __pure2;) extern char * realpath(const char *path, char *resolved); extern int system(const char *string); @@ -109,9 +109,9 @@ void arc4random_buf(void*, size_t); #define RAND_MAX 0x7fffffff -int rand(void); +_BIONIC_NOT_BEFORE_21(int rand(void);) int rand_r(unsigned int*); -void srand(unsigned int); +_BIONIC_NOT_BEFORE_21(void srand(unsigned int);) double drand48(void); double erand48(unsigned short[3]); @@ -124,12 +124,12 @@ unsigned short* seed48(unsigned short[3]); void srand48(long); char* initstate(unsigned int, char*, size_t); -long random(void); +_BIONIC_NOT_BEFORE_21(long random(void);) char* setstate(char*); -void srandom(unsigned int); +_BIONIC_NOT_BEFORE_21(void srandom(unsigned int);) int getpt(void); -int grantpt(int); +_BIONIC_NOT_BEFORE_21(int grantpt(int);) int posix_openpt(int); char* ptsname(int); int ptsname_r(int, char*, size_t); @@ -172,6 +172,10 @@ extern size_t wcstombs(char *, const wchar_t *, size_t); extern size_t __ctype_get_mb_cur_max(void); #define MB_CUR_MAX __ctype_get_mb_cur_max() +#if __ANDROID_API__ < 21 +#include <android/legacy_stdlib_inlines.h> +#endif + __END_DECLS #endif /* _STDLIB_H */ |