aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-14 09:05:45 +0000
committerNarayan Kamath <narayan@google.com>2014-03-14 09:05:45 +0000
commitd3c0cefb4fd5d16fd51e67e43fa44fb7d5d418b5 (patch)
tree4f9f7d0a3ca6bee1989df5b095b2fc6945a1f76b
parent2f60ea803f7214dc477392482d5726a5bf41583a (diff)
downloadstlport-d3c0cefb4fd5d16fd51e67e43fa44fb7d5d418b5.tar.gz
Fix 64 bit builds.
stlport doesn't expose localeconv and setlocale anyway, so there really isn't much point in exporting lconv either. This is not a source compatible change, but it certainly isn't the first such change we've made. Besides, lconv is a dummy structure anyway and there's nothing useful to be gained from it. Change-Id: Ifeeb929fc43bfc7a7c522cae18b9916027f04b82
-rw-r--r--stlport/stl/_clocale.h2
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