diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-14 11:06:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-14 11:06:52 +0000 |
| commit | 6f6b22e921d47ab5a6625199f609d2bbfb409061 (patch) | |
| tree | 4f9f7d0a3ca6bee1989df5b095b2fc6945a1f76b | |
| parent | 2f60ea803f7214dc477392482d5726a5bf41583a (diff) | |
| parent | d3c0cefb4fd5d16fd51e67e43fa44fb7d5d418b5 (diff) | |
| download | stlport-6f6b22e921d47ab5a6625199f609d2bbfb409061.tar.gz | |
Merge "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 |