diff options
author | simonb <simonb> | 2006-06-26 01:36:27 (GMT) |
---|---|---|
committer | simonb <simonb> | 2006-06-26 01:36:27 (GMT) |
commit | aedcaea054a91f10329377ca776396326d0078fa (patch) | |
tree | b506c987f26bb8720784a678b6026034f9b17532 /src/FbTk/FbString.hh | |
parent | b699ed4d9e4fd99fd894b5d3d2e3767c41ebf80c (diff) | |
download | fluxbox_paul-aedcaea054a91f10329377ca776396326d0078fa.zip fluxbox_paul-aedcaea054a91f10329377ca776396326d0078fa.tar.bz2 |
properly protect usage of iconv_t by HAVE_ICONV
Diffstat (limited to 'src/FbTk/FbString.hh')
-rw-r--r-- | src/FbTk/FbString.hh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh index 502290b..133945b 100644 --- a/src/FbTk/FbString.hh +++ b/src/FbTk/FbString.hh | |||
@@ -67,12 +67,20 @@ public: | |||
67 | ~StringConvertor(); | 67 | ~StringConvertor(); |
68 | 68 | ||
69 | bool setSource(const std::string &encoding); | 69 | bool setSource(const std::string &encoding); |
70 | void reset() { m_iconv = ((iconv_t)(-1)); } | 70 | void reset() { |
71 | #ifdef HAVE_ICONV | ||
72 | m_iconv = ((iconv_t)(-1)); | ||
73 | #endif | ||
74 | } | ||
71 | 75 | ||
72 | std::string recode(const std::string &src); | 76 | std::string recode(const std::string &src); |
73 | 77 | ||
74 | private: | 78 | private: |
79 | #ifdef HAVE_ICONV | ||
75 | iconv_t m_iconv; | 80 | iconv_t m_iconv; |
81 | #else | ||
82 | int m_iconv; | ||
83 | #endif | ||
76 | 84 | ||
77 | std::string m_destencoding; | 85 | std::string m_destencoding; |
78 | }; | 86 | }; |