M src/FbTk/FbString.cc → src/FbTk/FbString.cc

@@ -169,12 +169,12 @@ s_inited = true;
     setlocale(LC_CTYPE, "");
 
 #ifdef HAVE_ICONV
-#ifdef CODESET
+#if defined(CODESET) && !defined(_WIN32)
     s_locale_codeset = nl_langinfo(CODESET);
 #else // openbsd doesnt have this (yet?)
     std::string locale = setlocale(LC_CTYPE, NULL);
     size_t pos = locale.find('.');
-    if (pos != string::npos)
+    if (pos != std::string::npos)
         s_locale_codeset = locale.substr(pos+1);
 #endif // CODESET
 

M src/FbTk/Font.cc → src/FbTk/Font.cc

@@ -136,11 +136,11 @@ if (MB_CUR_MAX > 1) // more than one byte, then we're multibyte
         s_multibyte = true;
 
     // check for utf-8 mode
-#ifdef CODESET
+#if defined(CODESET) && !defined(_WIN32)
     char *locale_codeset = nl_langinfo(CODESET);
 #else // openbsd doesnt have this (yet?)
     char *locale_codeset = 0;
-#endif // CODESET
+#endif // defined(CODESET) && !defined(_WIN32)
 
     if (locale_codeset && strcmp("UTF-8", locale_codeset) == 0) {
         s_utf8mode = true;