diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-14 17:52:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:52:43 +0000 |
| commit | 532fb7dea76abad7f0a035bf1634c373d7f04190 (patch) | |
| tree | 4f9f7d0a3ca6bee1989df5b095b2fc6945a1f76b | |
| parent | 92811990de96603e7dc4c8d26c96793b795797b2 (diff) | |
| parent | 6326c00d0206627b63fe7b70e4f43a9b95d8d065 (diff) | |
| download | stlport-532fb7dea76abad7f0a035bf1634c373d7f04190.tar.gz | |
am 6326c00d: am 6f6b22e9: Merge "Fix 64 bit builds."
* commit '6326c00d0206627b63fe7b70e4f43a9b95d8d065':
Fix 64 bit builds.
| -rw-r--r-- | stlport/stl/_clocale.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stlport/stl/_clocale.h b/stlport/stl/_clocale.h index 2dcf39a..23622da 100644 --- a/stlport/stl/_clocale.h +++ b/stlport/stl/_clocale.h @@ -30,8 +30,8 @@ # if defined (_STLP_IMPORT_VENDOR_CSTD) _STLP_BEGIN_NAMESPACE -using _STLP_VENDOR_CSTD::lconv; # if !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS) && !defined(__ANDROID__) +using _STLP_VENDOR_CSTD::lconv; using _STLP_VENDOR_CSTD::localeconv; using _STLP_VENDOR_CSTD::setlocale; # endif |