diff options
| author | akir <akir> | 2004-09-01 00:09:03 (GMT) |
|---|---|---|
| committer | akir <akir> | 2004-09-01 00:09:03 (GMT) |
| commit | 1c2edb9a01817fbac169e12f14944e8676c013dc (patch) | |
| tree | d159fda57a59a45c82f7c563945e6cb431049eae /src | |
| parent | 0c5dae0b4546da182cac520e21c94cfbc5bc1f3f (diff) | |
| download | fluxbox-1c2edb9a01817fbac169e12f14944e8676c013dc.zip fluxbox-1c2edb9a01817fbac169e12f14944e8676c013dc.tar.bz2 | |
final fix for iconv-issues on sun/sparcs
Diffstat (limited to 'src')
| -rw-r--r-- | src/FbTk/Font.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index 3d4608d..5665993 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
| 21 | 21 | ||
| 22 | //$Id: Font.cc,v 1.18 2004/08/31 23:07:58 akir Exp $ | 22 | //$Id: Font.cc,v 1.19 2004/09/01 00:09:03 akir Exp $ |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | #include "StringUtil.hh" | 25 | #include "StringUtil.hh" |
| @@ -122,7 +122,7 @@ char* recode(iconv_t cd, | |||
| 122 | size_t result = (size_t)(-1); | 122 | size_t result = (size_t)(-1); |
| 123 | 123 | ||
| 124 | #ifdef HAVE_CONST_ICONV | 124 | #ifdef HAVE_CONST_ICONV |
| 125 | result = iconv(cd, const_cast<char **>(&msg_ptr), &inbytesleft, &new_msg, &outbytesleft); | 125 | result = iconv(cd, (const char**)(&msg_ptr), &inbytesleft, &new_msg, &outbytesleft); |
| 126 | #else | 126 | #else |
| 127 | result = iconv(cd, &msg_ptr, &inbytesleft, &new_msg, &outbytesleft); | 127 | result = iconv(cd, &msg_ptr, &inbytesleft, &new_msg, &outbytesleft); |
| 128 | #endif // HAVE_CONST_ICONV | 128 | #endif // HAVE_CONST_ICONV |