
Summary: We never actually mean to always inline a function -- all the uses of the macro I could find are actually attempts to control the visibility of symbols. This is better described by _LIBCPP_INLINE_VISIBILITY, which is actually always defined the same. This change is orthogonal to the decision of what we're actually going to do with _LIBCPP_INLINE_VISIBILITY -- it just simplifies things by having one canonical way of doing things. Note that this commit had originally been applied in r336369 and then reverted in r336382 because of unforeseen problems. Both of these problems have now been fixed. Reviewers: EricWF, mclow.lists Subscribers: christof, dexonsmith, erikvanderpoel Differential Revision: https://reviews.llvm.org/D48892 llvm-svn: 336866
69 lines
1.8 KiB
C++
69 lines
1.8 KiB
C++
// -*- C++ -*-
|
|
//===------------------- support/android/locale_bionic.h ------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is dual licensed under the MIT and the University of Illinois Open
|
|
// Source Licenses. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H
|
|
#define _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H
|
|
|
|
#if defined(__BIONIC__)
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <xlocale.h>
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#if defined(__ANDROID__)
|
|
|
|
#include <android/api-level.h>
|
|
#include <android/ndk-version.h>
|
|
#include <support/xlocale/__posix_l_fallback.h>
|
|
// In NDK versions later than 16, locale-aware functions are provided by
|
|
// legacy_stdlib_inlines.h
|
|
#if __NDK_MAJOR__ <= 16
|
|
#if __ANDROID_API__ < 21
|
|
#include <support/xlocale/__strtonum_fallback.h>
|
|
#elif __ANDROID_API__ < 26
|
|
|
|
#if defined(__cplusplus)
|
|
extern "C" {
|
|
#endif
|
|
|
|
inline _LIBCPP_INLINE_VISIBILITY float strtof_l(const char* __nptr, char** __endptr,
|
|
locale_t) {
|
|
return ::strtof(__nptr, __endptr);
|
|
}
|
|
|
|
inline _LIBCPP_INLINE_VISIBILITY double strtod_l(const char* __nptr,
|
|
char** __endptr, locale_t) {
|
|
return ::strtod(__nptr, __endptr);
|
|
}
|
|
|
|
inline _LIBCPP_INLINE_VISIBILITY long strtol_l(const char* __nptr, char** __endptr,
|
|
int __base, locale_t) {
|
|
return ::strtol(__nptr, __endptr, __base);
|
|
}
|
|
|
|
#if defined(__cplusplus)
|
|
}
|
|
#endif
|
|
|
|
#endif // __ANDROID_API__ < 26
|
|
|
|
#endif // __NDK_MAJOR__ <= 16
|
|
#endif // defined(__ANDROID__)
|
|
|
|
#endif // defined(__BIONIC__)
|
|
#endif // _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H
|