diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-09-12 21:24:18 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-09-12 21:24:18 +0000 |
| commit | d466d6a39f785c44a09adf3fc58b5a425c63f33b (patch) | |
| tree | e24919f69ac661aeb3fd14b2439a84d88abaef74 /src/xine-engine/osd.c | |
| parent | a065c7dc482ea280d7f30f23626171a8303ec488 (diff) | |
| download | xine-lib-d466d6a39f785c44a09adf3fc58b5a425c63f33b.tar.gz xine-lib-d466d6a39f785c44a09adf3fc58b5a425c63f33b.tar.bz2 | |
Fixed iconv warnings on FreeBSD, fixed build w/o iconv but require it as default.
CVS patchset: 8223
CVS date: 2006/09/12 21:24:18
Diffstat (limited to 'src/xine-engine/osd.c')
| -rw-r--r-- | src/xine-engine/osd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 80eff7461..320240aa8 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -957,7 +957,8 @@ static int osd_search(osd_fontchar_t *array, size_t n, uint16_t code) { * get next unicode value */ static uint16_t osd_iconv_getunicode(xine_t *xine, - iconv_t *cd, const char *encoding, char **inbuf, size_t *inbytesleft) { + iconv_t *cd, const char *encoding, ICONV_CONST char **inbuf, + size_t *inbytesleft) { uint16_t unicode; char *outbuf = (char*)&unicode; size_t outbytesleft = 2; @@ -1105,7 +1106,7 @@ static int osd_render_text (osd_object_t *osd, int x1, int y1, while( inbytesleft ) { #ifdef HAVE_ICONV unicode = osd_iconv_getunicode(this->stream->xine, osd->cd, osd->encoding, - (char **)&inbuf, &inbytesleft); + (ICONV_CONST char **)&inbuf, &inbytesleft); #else unicode = inbuf[0]; inbuf++; @@ -1273,7 +1274,7 @@ static int osd_get_text_size(osd_object_t *osd, const char *text, int *width, in while( inbytesleft ) { #ifdef HAVE_ICONV unicode = osd_iconv_getunicode(this->stream->xine, osd->cd, osd->encoding, - (char **)&inbuf, &inbytesleft); + (ICONV_CONST char **)&inbuf, &inbytesleft); #else unicode = inbuf[0]; inbuf++; |