diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-21 18:08:00 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-21 18:08:00 +0000 |
| commit | 093c7f7d26dd6d8028a01d9eefe313efd82c075a (patch) | |
| tree | b2d1d4efd1d53d48c6e295600c82206a461f611e /src | |
| parent | cairo-render-context: swap order of header inclusion to redefinition clash of... (diff) | |
| download | inkscape-093c7f7d26dd6d8028a01d9eefe313efd82c075a.tar.gz inkscape-093c7f7d26dd6d8028a01d9eefe313efd82c075a.zip | |
libuemf: make uemf_utf.c compile cleanly with specific version of iconv. (current devlibs version)
(bzr r13181)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libuemf/uemf_utf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libuemf/uemf_utf.c b/src/libuemf/uemf_utf.c index bce60af4d..0c07148a4 100644 --- a/src/libuemf/uemf_utf.c +++ b/src/libuemf/uemf_utf.c @@ -49,11 +49,14 @@ void U_swap2(void *ul, unsigned int count); on another funky system this code may need to be modified, or define ICONV_CAST on the compile line(but it may be tricky). */ +#if _LIBICONV_VERSION == 0x0109 +# define ICONV_CAST (const char **) +#endif // _LIBICONV_VERSION 0x0109 #ifdef SOL8 -#define ICONV_CAST (const char **) +# define ICONV_CAST (const char **) #endif //SOL8 #if !defined(ICONV_CAST) -#define ICONV_CAST (char **) +# define ICONV_CAST (char **) #endif //ICONV_CAST /** \endcond */ |