nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly protect usage of iconv_t by HAVE_ICONV

Browse source
This commit is contained in:
simonb 2006-06-26 01:36:27 +00:00
parent b699ed4d9e
commit aedcaea054
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/FbTk/FbString.cc
View file

@ -231,14 +231,18 @@ bool haveUTF8() {
}; // end namespace StringUtil
StringConvertor::StringConvertor(EncodingTarget target): m_iconv((iconv_t)(-1)) {
StringConvertor::StringConvertor(EncodingTarget target):
#ifdef HAVE_ICONV
m_iconv((iconv_t)(-1)) {
if (target == ToLocaleStr)
m_destencoding = FbStringUtil::locale_codeset;
else
m_destencoding = "UTF-8";
#endif
}
#else
m_iconv(-1) {}
#endif
StringConvertor::~StringConvertor() {
#ifdef HAVE_ICONV

10
src/FbTk/FbString.hh
View file

@ -67,12 +67,20 @@ public:
~StringConvertor();
bool setSource(const std::string &encoding);
void reset() { m_iconv = ((iconv_t)(-1)); }
void reset() {
#ifdef HAVE_ICONV
m_iconv = ((iconv_t)(-1));
#endif
}
std::string recode(const std::string &src);
private:
#ifdef HAVE_ICONV
iconv_t m_iconv;
#else
int m_iconv;
#endif
std::string m_destencoding;
};