diff options
| author | Ryan Pavlik <rpavlik@iastate.edu> | 2011-10-28 19:06:45 (GMT) |
|---|---|---|
| committer | Ryan Pavlik <rpavlik@iastate.edu> | 2011-10-31 15:54:09 (GMT) |
| commit | b82999c1ac47b7b559815636f615d0c1ffa5cb56 (patch) | |
| tree | aeb9bc9f278bdbfba72f9d43cfe7395e5f7213bb /src/FbTk/FbString.cc | |
| parent | d4f682c7bd1ca150693fa3028d0a8c6bdd1820fd (diff) | |
| download | fluxbox-b82999c1ac47b7b559815636f615d0c1ffa5cb56.zip fluxbox-b82999c1ac47b7b559815636f615d0c1ffa5cb56.tar.bz2 | |
FbTk/FbString.cc,Font.cc: Windows doesn't have nl_langinfo
Diffstat (limited to 'src/FbTk/FbString.cc')
| -rw-r--r-- | src/FbTk/FbString.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc index d62f5fa..5577f32 100644 --- a/src/FbTk/FbString.cc +++ b/src/FbTk/FbString.cc | |||
| @@ -169,12 +169,12 @@ void init() { | |||
| 169 | setlocale(LC_CTYPE, ""); | 169 | setlocale(LC_CTYPE, ""); |
| 170 | 170 | ||
| 171 | #ifdef HAVE_ICONV | 171 | #ifdef HAVE_ICONV |
| 172 | #ifdef CODESET | 172 | #if defined(CODESET) && !defined(_WIN32) |
| 173 | s_locale_codeset = nl_langinfo(CODESET); | 173 | s_locale_codeset = nl_langinfo(CODESET); |
| 174 | #else // openbsd doesnt have this (yet?) | 174 | #else // openbsd doesnt have this (yet?) |
| 175 | std::string locale = setlocale(LC_CTYPE, NULL); | 175 | std::string locale = setlocale(LC_CTYPE, NULL); |
| 176 | size_t pos = locale.find('.'); | 176 | size_t pos = locale.find('.'); |
| 177 | if (pos != string::npos) | 177 | if (pos != std::string::npos) |
| 178 | s_locale_codeset = locale.substr(pos+1); | 178 | s_locale_codeset = locale.substr(pos+1); |
| 179 | #endif // CODESET | 179 | #endif // CODESET |
| 180 | 180 | ||