summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-09 10:31:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-10 18:31:58 +0100
commit4870b950d440fe527a07de5b59256c07a6013591 (patch)
tree271c3a224d6e58b3a37b4822157700c3faef5c1d /sal
parent45aaf13b8dfc5854acff7c1d4b42bbfd7e69ac35 (diff)
Rename _imp_get/setProcessLocale (avoid reserved identifiers)
Change-Id: Iab013039d3f99ee06efc1556b768f16ec8bcee2a
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/nlsupport.cxx10
-rw-r--r--sal/osl/unx/nlsupport.hxx4
-rw-r--r--sal/osl/unx/process_impl.cxx4
3 files changed, 9 insertions, 9 deletions
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index c5e073c538fa..3c7143cdb678 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -633,7 +633,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
return the current process locale
*****************************************************************************/
-void _imp_getProcessLocale( rtl_Locale ** ppLocale )
+void imp_getProcessLocale( rtl_Locale ** ppLocale )
{
char * locale;
@@ -657,7 +657,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
set the current process locale
*****************************************************************************/
-int _imp_setProcessLocale( rtl_Locale * pLocale )
+int imp_setProcessLocale( rtl_Locale * pLocale )
{
char locale_buf[64] = "";
int ret = 0;
@@ -840,7 +840,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
return the current process locale
*****************************************************************************/
-void _imp_getProcessLocale( rtl_Locale ** ppLocale )
+void imp_getProcessLocale( rtl_Locale ** ppLocale )
{
rtl::OUString loc16(macosx_getLocale());
rtl::OString locale;
@@ -880,7 +880,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
return the current process locale
*****************************************************************************/
-void _imp_getProcessLocale( rtl_Locale ** ppLocale )
+void imp_getProcessLocale( rtl_Locale ** ppLocale )
{
#ifdef ANDROID
/* No locale environment variables on Android, so why even bother
@@ -915,7 +915,7 @@ _setenv (const char* name, const char* value)
return setenv (name, value, 1);
}
-int _imp_setProcessLocale( rtl_Locale * pLocale )
+int imp_setProcessLocale( rtl_Locale * pLocale )
{
char locale_buf[64];
diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx
index 799df2f54e3b..abcf42498fa7 100644
--- a/sal/osl/unx/nlsupport.hxx
+++ b/sal/osl/unx/nlsupport.hxx
@@ -26,8 +26,8 @@
namespace rtl { class OUString; }
-void _imp_getProcessLocale( rtl_Locale ** );
-int _imp_setProcessLocale( rtl_Locale * );
+void imp_getProcessLocale( rtl_Locale ** );
+int imp_setProcessLocale( rtl_Locale * );
#if defined IOS || defined MACOSX
rtl::OUString macosx_getLocale();
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index d29ffb893939..9e6de6fed3cd 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -446,7 +446,7 @@ oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale )
pthread_mutex_lock(&(g_process_locale.m_mutex));
if (g_process_locale.m_pLocale == nullptr)
- _imp_getProcessLocale (&(g_process_locale.m_pLocale));
+ imp_getProcessLocale (&(g_process_locale.m_pLocale));
*ppLocale = g_process_locale.m_pLocale;
result = osl_Process_E_None;
@@ -465,7 +465,7 @@ oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale )
OSL_PRECOND(pLocale, "osl_setProcessLocale(): Invalid parameter.");
pthread_mutex_lock(&(g_process_locale.m_mutex));
- if (_imp_setProcessLocale (pLocale) == 0)
+ if (imp_setProcessLocale (pLocale) == 0)
{
g_process_locale.m_pLocale = pLocale;
result = osl_Process_E_None;