make regex and asciidoc work on Darwin without hacking

[libucw.git] / charset / mp-charconv.h

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index f33cd373e590620a7ceb9e6051d3b166fc89952c..97604983ea4320645ea74b594bf2e3d4963074e6 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -10,17 +10,17 @@
 #ifndef _CHARSET_MP_CHARCONV_H
 #define _CHARSET_MP_CHARCONV_H
 
 #ifndef _CHARSET_MP_CHARCONV_H
 #define _CHARSET_MP_CHARCONV_H
 

-#include "lib/mempool.h"
+#include "ucw/mempool.h"

 #include "charset/charconv.h"
 
 #include "charset/charconv.h"
 

-byte *mp_strconv(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 *
 
 static inline byte *

-mp_strconv_to_utf8(struct mempool *mp, byte *s, uns cs_in)
+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 *
 { return mp_strconv(mp, s, cs_in, CONV_CHARSET_UTF8); }
 
 static inline byte *

-mp_strconv_from_utf8(struct mempool *mp, byte *s, uns 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
 { return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif