[Libreoffice-commits] core.git: sal/osl

Stephan Bergmann sbergman at redhat.com
Wed Nov 19 04:39:12 PST 2014


 sal/osl/unx/nlsupport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78ac39dcef36b3881b2574b2db1e0d5a068c7804
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 19 13:38:09 2014 +0100

    Revert "-Werror,-Wc++11-compat-deprecated-writable-strings"
    
    This reverts commit 0e589394e8452ee8dea8e807d3b5ef6620a1c6c1, which
    was a misguided attempt at solving a problem already solved by Tor.

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 2a5c659..a7e7640 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -844,7 +844,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 
 void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 {
-    static char const *locale = NULL;
+    static char *locale = NULL;
 
     /* basic thread safeness */
 //    pthread_mutex_lock( &aLocalMutex );


More information about the Libreoffice-commits mailing list