diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-14 11:11:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 11:11:46 +0000 |
| commit | 05fa6fe6de8d3a3b9f2d0d70533bd911ec9094be (patch) | |
| tree | 4f9f7d0a3ca6bee1989df5b095b2fc6945a1f76b | |
| parent | aa0e1879ad3dd57306cf04c8953326679a91afd8 (diff) | |
| parent | 6f6b22e921d47ab5a6625199f609d2bbfb409061 (diff) | |
| download | stlport-05fa6fe6de8d3a3b9f2d0d70533bd911ec9094be.tar.gz | |
am 6f6b22e9: Merge "Fix 64 bit builds."
* commit '6f6b22e921d47ab5a6625199f609d2bbfb409061':
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 |