X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=charset%2Fmp-charconv.h;h=a51e05e70f01ab17c79afe13b1d58d1d681c8435;hb=39b28bffc195348b93294b5fa0a8b9e87ea7317a;hp=2677c8049a1ba32fec9e93b56f717d95a79c05f8;hpb=ee58c363f2df512f649ac2837ee06c3cdbc75a03;p=libucw.git

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index 2677c804..a51e05e7 100644
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -1,5 +1,5 @@
 /*
- *	Sherlock Library -- Character Conversion with Allocation on a Memory Pool 
+ *	Sherlock Library -- Character Conversion with Allocation on a Memory Pool
  *
  *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
  *
@@ -10,17 +10,17 @@
 #ifndef _CHARSET_MP_CHARCONV_H
 #define _CHARSET_MP_CHARCONV_H
 
-#include "lib/mempool.h"
-#include "charset/charconv.h"
+#include <ucw/mempool.h>
+#include <charset/charconv.h>
 
-byte *mp_conv(struct mempool *mp, byte *s, uns cs_in, uns cs_out);
+byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns cs_out);
 
 static inline byte *
-mp_conv_to_utf8(struct mempool *mp, byte *s, uns cs_in) 
-{ return mp_conv(mp, s, cs_in, CONV_CHARSET_UTF8); }
+mp_strconv_to_utf8(struct mempool *mp, const byte *s, uns cs_in)
+{ return mp_strconv(mp, s, cs_in, CONV_CHARSET_UTF8); }
 
 static inline byte *
-mp_conv_from_utf8(struct mempool *mp, byte *s, uns cs_out)
-{ return mp_conv(mp, s, CONV_CHARSET_UTF8, cs_out); }
+mp_strconv_from_utf8(struct mempool *mp, const byte *s, uns cs_out)
+{ return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif