diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-28 09:48:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-28 09:48:38 -0800 |
| commit | 410f9bd13773ec84c0258536e800b1e446e27521 (patch) | |
| tree | 86d676e22ee2446539876acedd56e5f4255f2ee0 | |
| parent | 27d98815eb375840362adaa5cb5c27af7aa0cd4d (diff) | |
| parent | 8cfe752a64222225f3199da5feff6664628590c9 (diff) | |
| download | stlport-410f9bd13773ec84c0258536e800b1e446e27521.tar.gz | |
am 8cfe752a: Merge "misc fix"
* commit '8cfe752a64222225f3199da5feff6664628590c9':
misc fix
| -rw-r--r-- | stlport/stl/_clocale.h | 2 | ||||
| -rw-r--r-- | stlport/stl/_cmath.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stlport/stl/_clocale.h b/stlport/stl/_clocale.h index 091a9b6..2dcf39a 100644 --- a/stlport/stl/_clocale.h +++ b/stlport/stl/_clocale.h @@ -31,7 +31,7 @@ # if defined (_STLP_IMPORT_VENDOR_CSTD) _STLP_BEGIN_NAMESPACE using _STLP_VENDOR_CSTD::lconv; -# if !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS) +# if !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS) && !defined(__ANDROID__) using _STLP_VENDOR_CSTD::localeconv; using _STLP_VENDOR_CSTD::setlocale; # endif diff --git a/stlport/stl/_cmath.h b/stlport/stl/_cmath.h index 5cb0cd5..771c27d 100644 --- a/stlport/stl/_cmath.h +++ b/stlport/stl/_cmath.h @@ -205,7 +205,7 @@ double functions but cast the arguments and return values to the given type. */ /** rough characterization of compiler and native C library For the compiler, it can either support long double or not. If it doesn't, the -macro _STLP_NO_LONG_DOUBLE is not defined and we don't define any long double +macro _STLP_NO_LONG_DOUBLE is defined and we don't define any long double overloads. For the native C library the question is whether it has variants with an 'f' suffix (for float as opposed to double) or an 'l' suffix (for long double). If |