diff -Naur dclib-0.3.19.orig/dclib/cconfig.cpp dclib-0.3.19/dclib/cconfig.cpp --- dclib-0.3.19.orig/dclib/cconfig.cpp 2008-08-24 16:23:42.000000000 +0100 +++ dclib-0.3.19/dclib/cconfig.cpp 2008-08-24 16:24:24.000000000 +0100 @@ -418,33 +418,7 @@ /** Default to false, share dot files (previous behaviour) */ m_bDontShareDotFiles = false; -#ifdef HAVE_LANGINFO_H - m_sLocalEncoding = nl_langinfo(CODESET); - if ( m_sLocalEncoding.IsEmpty() ) - { -#ifdef WIN32 - m_sLocalEncoding = "WINDOWS-1252"; -#else - m_sLocalEncoding = "UTF-8"; -#endif - } -#else // HAVE_LANGINFO_H - /** Read local encoding from $LANG */ - m_sLocalEncoding = getenv("LANG"); - int pos = m_sLocalEncoding.Find('.'); - if ( pos == -1 ) - { -#ifdef WIN32 - m_sLocalEncoding = "WINDOWS-1252"; -#else - m_sLocalEncoding = "UTF-8"; -#endif - } - else - { - m_sLocalEncoding = m_sLocalEncoding.Mid(pos + 1); - } -#endif // HAVE_LANGINFO_H + m_sLocalEncoding = "UTF-8"; /** Default to UserIP2 support disabled */ m_bUserIP2Enabled = false; diff -Naur dclib-0.3.19.orig/dclib/core/cxml.cpp dclib-0.3.19/dclib/core/cxml.cpp --- dclib-0.3.19.orig/dclib/core/cxml.cpp 2008-08-24 16:23:42.000000000 +0100 +++ dclib-0.3.19/dclib/core/cxml.cpp 2008-08-24 16:25:01.000000000 +0100 @@ -51,32 +51,7 @@ pDoc = 0; pNode = 0; -#ifdef HAVE_LANGINFO_H - CString local = nl_langinfo(CODESET); - if ( local.IsEmpty() ) - { -#ifdef WIN32 - local = "WINDOWS-1252"; -#else - local = "UTF-8"; -#endif - } -#else // HAVE_LANGINFO_H - CString local = getenv("LANG"); - int i = local.Find('.'); - if ( i == -1 ) - { -#ifdef WIN32 - local = "WINDOWS-1252"; -#else - local = "UTF-8"; -#endif - } - else - { - local = local.Mid(i + 1); - } -#endif // HAVE_LANGINFO_H + local = "UTF-8"; pToUTF8 = new CIconv( local, "UTF-8" ); pFromUTF8 = new CIconv( "UTF-8", local );