diff options
Diffstat (limited to 'kernel/kls_xcf/xcf2pnm/xcf-general.c')
| -rw-r--r-- | kernel/kls_xcf/xcf2pnm/xcf-general.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel/kls_xcf/xcf2pnm/xcf-general.c b/kernel/kls_xcf/xcf2pnm/xcf-general.c index 9231134..fadba37 100644 --- a/kernel/kls_xcf/xcf2pnm/xcf-general.c +++ b/kernel/kls_xcf/xcf2pnm/xcf-general.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xcftools.h" #include <string.h> #include <errno.h> #ifdef HAVE_ICONV # include <iconv.h> -#elif !defined(ICONV_CONST) -# define ICONV_CONST const #endif uint8_t *xcf_file = 0 ; @@ -91,13 +93,13 @@ xcfString(uint32_t ptr,uint32_t *after) { uint32_t length ; unsigned i ; - ICONV_CONST char *utf8master ; + const char *utf8master ; xcfCheckspace(ptr,4,"(string length)"); length = xcfL(ptr) ; ptr += 4 ; xcfCheckspace(ptr,length,"(string)"); - utf8master = (ICONV_CONST char*)(xcf_file+ptr) ; + utf8master = (const char*)(xcf_file+ptr) ; if( after ) *after = ptr + length ; if( length == 0 || utf8master[length-1] != 0 ) FatalBadXCF("String at %" PRIX32 " not zero-terminated",ptr-4); @@ -130,7 +132,7 @@ xcfString(uint32_t ptr,uint32_t *after) else while(1) { char *buffer = xcfmalloc(targetsize) ; - ICONV_CONST char *inbuf = utf8master ; + const char *inbuf = utf8master ; char *outbuf = buffer ; size_t incount = length ; size_t outcount = targetsize ; |