diff options
author | Elliott Hughes <enh@google.com> | 2017-07-17 18:02:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-17 18:02:00 +0000 |
commit | af210a1a65adf5ae2c2b7ce3a9a8fc7c9e9ea93d (patch) | |
tree | 0c350d016df795efbab7afa636a5af9b1bf59844 /sources | |
parent | d5ef10196dfb24b9994e8738cd3b7b7c3af19e3c (diff) | |
parent | 89f75a10c9886a02d30028d77073ec3d4f3e5a83 (diff) | |
download | ndk-af210a1a65adf5ae2c2b7ce3a9a8fc7c9e9ea93d.tar.gz |
Merge "Remove various unnecessary override headers."
Diffstat (limited to 'sources')
-rw-r--r-- | sources/android/support/include/ctype.h | 64 | ||||
-rw-r--r-- | sources/android/support/include/langinfo.h | 43 | ||||
-rw-r--r-- | sources/android/support/include/locale.h | 7 | ||||
-rw-r--r-- | sources/android/support/include/nl_types.h | 52 | ||||
-rw-r--r-- | sources/android/support/include/stdint.h | 39 | ||||
-rw-r--r-- | sources/android/support/include/stdio.h | 68 | ||||
-rw-r--r-- | sources/android/support/include/string.h | 50 | ||||
-rw-r--r-- | sources/android/support/include/time.h | 52 | ||||
-rw-r--r-- | sources/android/support/include/wchar.h | 6 |
9 files changed, 6 insertions, 375 deletions
diff --git a/sources/android/support/include/ctype.h b/sources/android/support/include/ctype.h deleted file mode 100644 index f9e859ca0..000000000 --- a/sources/android/support/include/ctype.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_CTYPE_H -#define NDK_ANDROID_SUPPORT_CTYPE_H - -// Get the system header first. -#include_next <ctype.h> - -#if !defined(__LP64__) - -#include <xlocale.h> // for locale_t - -#ifdef __cplusplus -extern "C" { -#endif - -int isalnum_l(int, locale_t); -int isalpha_l(int, locale_t); -int isblank_l(int, locale_t); -int iscntrl_l(int, locale_t); -int isgraph_l(int, locale_t); -int isprint_l(int, locale_t); -int ispunct_l(int, locale_t); -int isspace_l(int, locale_t); - -int islower_l(int, locale_t); -int isupper_l(int, locale_t); -int isdigit_l(int, locale_t); -int isxdigit_l(int, locale_t); -int tolower_l(int, locale_t); -int toupper_l(int, locale_t); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // !__LP64__ - -#endif // NDK_ANDROID_SUPPORT_CTYPE_H diff --git a/sources/android/support/include/langinfo.h b/sources/android/support/include/langinfo.h deleted file mode 100644 index 1a37ad508..000000000 --- a/sources/android/support/include/langinfo.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_LANGINFO_H -#define NDK_ANDROID_SUPPORT_LANGINFO_H - -#include_next <langinfo.h> - -__BEGIN_DECLS - -#if __ANDROID_API__ < __ANDROID_API_O__ - -char* nl_langinfo(nl_item); - -#endif - -__END_DECLS - -#endif /* NDK_ANDROID_SUPPORT_LANGINFO_H */ diff --git a/sources/android/support/include/locale.h b/sources/android/support/include/locale.h index 3b1db50c5..8934c3955 100644 --- a/sources/android/support/include/locale.h +++ b/sources/android/support/include/locale.h @@ -129,13 +129,6 @@ struct lconv { struct lconv* localeconv(void); -#if 0 -// Used to implement the std::ctype<char> specialization. -extern const char * const __ctype_c_mask_table; -// TODO(ajwong): Make this based on some exported bionic constant. -const int __ctype_c_mask_table_size = 256; -#endif - #ifdef __cplusplus } // extern "C" #endif diff --git a/sources/android/support/include/nl_types.h b/sources/android/support/include/nl_types.h deleted file mode 100644 index dae064af4..000000000 --- a/sources/android/support/include/nl_types.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_NL_TYPES_H -#define NDK_ANDROID_SUPPORT_NL_TYPES_H - -// __LP64__ - -#define NL_SETD 1 -#define NL_CAT_LOCALE 1 - -#ifdef __cplusplus -extern "C" { -#endif - -typedef void* nl_catd; -typedef int nl_item; - -nl_catd catopen(const char*, int); -char* catgets(nl_catd, int, int, const char*); -int catclose(nl_catd); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif /* NDK_ANDROID_SUPPORT_NL_TYPES_H */ - diff --git a/sources/android/support/include/stdint.h b/sources/android/support/include/stdint.h deleted file mode 100644 index f28797bf9..000000000 --- a/sources/android/support/include/stdint.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_STDINT_H -#define NDK_ANDROID_SUPPORT_STDINT_H - -#include_next <stdint.h> - -#if !defined(__LP64__) - -#include <limits.h> // For SIZE_MAX - -#endif // !__LP64__ - -#endif // NDK_ANDROID_SUPPORT_STDINT_H diff --git a/sources/android/support/include/stdio.h b/sources/android/support/include/stdio.h deleted file mode 100644 index f7726345c..000000000 --- a/sources/android/support/include/stdio.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_STDIO_H -#define NDK_ANDROID_SUPPORT_STDIO_H - -#if defined(__LP64__) - -#include_next <stdio.h> - -#else - -// This is to avoid a compiler error when the putc() macro definition -// in <stdio.h> follows a putc() function definition which is apparently -// not compatible with it. -#if !defined(_POSIX_THREADS) -#define _POSIX_THREADS 200809L -#endif -#include_next <stdio.h> - -#include <stdarg.h> -#include <wchar.h> -#include <xlocale.h> - -#ifdef __cplusplus -extern "C" { -#endif - -int asprintf_l(char**, locale_t, const char*, ...); -int sprintf_l(char*, locale_t, const char*, ...); -int snprintf_l(char*, size_t, locale_t, const char*, ...); -int sscanf_l(const char*, locale_t, const char*, ...); - -int vfwscanf(FILE* __restrict__, const wchar_t* __restrict__, va_list); -int vswscanf(const wchar_t *__restrict__, const wchar_t * __restrict__, va_list); -int vwscanf(const wchar_t *__restrict__, va_list); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // !__LP64__ - -#endif // NDK_ANDROID_SUPPORT_STDIO_H diff --git a/sources/android/support/include/string.h b/sources/android/support/include/string.h deleted file mode 100644 index 732df754f..000000000 --- a/sources/android/support/include/string.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_STRING_H -#define NDK_ANDROID_SUPPORT_STRING_H - -#include_next <string.h> - -#if !defined(__LP64__) - -#include <xlocale.h> - -#ifdef __cplusplus -extern "C" { -#endif - -int strcoll_l(const char*, const char*, locale_t); -size_t strxfrm_l(char *, const char *, size_t, locale_t); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // !__LP64__ - -#endif // NDK_ANDROID_SUPPORT_STRING_H diff --git a/sources/android/support/include/time.h b/sources/android/support/include/time.h deleted file mode 100644 index aadec6025..000000000 --- a/sources/android/support/include/time.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef NDK_ANDROID_SUPPORT_TIME_H -#define NDK_ANDROID_SUPPORT_TIME_H - -// __LP64__ - -#include_next <time.h> - -#if !defined(__LP64__) - -#include <xlocale.h> - -#ifdef __cplusplus -extern "C" { -#endif - -size_t strftime_l(char *s, size_t maxsize, const char *format, - const struct tm * timeptr, locale_t locale); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // !__LP64__ - -#endif // NDK_ANDROID_SUPPORT_TIME_H diff --git a/sources/android/support/include/wchar.h b/sources/android/support/include/wchar.h index 6676ab7b0..906535e45 100644 --- a/sources/android/support/include/wchar.h +++ b/sources/android/support/include/wchar.h @@ -35,6 +35,12 @@ __BEGIN_DECLS #if __ANDROID_API__ < __ANDROID_API_L__ +#include <stdarg.h> + +int vfwscanf(FILE*, const wchar_t*, va_list); +int vswscanf(const wchar_t*, const wchar_t*, va_list); +int vwscanf(const wchar_t*, va_list); + size_t mbsnrtowcs(wchar_t*, const char**, size_t, size_t, mbstate_t*); int vswprintf(wchar_t*, size_t, const wchar_t*, va_list); size_t wcsnrtombs(char*, const wchar_t**, size_t, size_t, mbstate_t*); |