X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fff-unicode.h;h=8341eb8b42a26d12f4814cc852a2ae2e15b82ff6;hb=b8667492cf36a609939ee35ac42900ff0b0cc80f;hp=44593440e229e2a54db8961339c6b068590073df;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

diff --git a/ucw/ff-unicode.h b/ucw/ff-unicode.h
index 44593440..8341eb8b 100644
--- a/ucw/ff-unicode.h
+++ b/ucw/ff-unicode.h
@@ -12,20 +12,30 @@
 #ifndef _UCW_FF_UNICODE_H
 #define _UCW_FF_UNICODE_H
 
-#include "ucw/fastbuf.h"
-#include "ucw/unicode.h"
+#include <ucw/fastbuf.h>
+#include <ucw/unicode.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bget_utf16_be_slow ucw_bget_utf16_be_slow
+#define bget_utf16_le_slow ucw_bget_utf16_le_slow
+#define bget_utf8_32_slow ucw_bget_utf8_32_slow
+#define bget_utf8_slow ucw_bget_utf8_slow
+#define bput_utf16_be_slow ucw_bput_utf16_be_slow
+#define bput_utf16_le_slow ucw_bput_utf16_le_slow
+#define bput_utf8_32_slow ucw_bput_utf8_32_slow
+#define bput_utf8_slow ucw_bput_utf8_slow
+#endif
 
 /* ** UTF-8 ** */
 
-int bget_utf8_slow(struct fastbuf *b, uns repl);
-int bget_utf8_32_slow(struct fastbuf *b, uns repl);
-void bput_utf8_slow(struct fastbuf *b, uns u);
-void bput_utf8_32_slow(struct fastbuf *b, uns u);
+int bget_utf8_slow(struct fastbuf *b, uint repl);
+int bget_utf8_32_slow(struct fastbuf *b, uint repl);
+void bput_utf8_slow(struct fastbuf *b, uint u);
+void bput_utf8_32_slow(struct fastbuf *b, uint u);
 
-static inline int
-bget_utf8_repl(struct fastbuf *b, uns repl)
+static inline int bget_utf8_repl(struct fastbuf *b, uint repl)
 {
-  uns u;
+  uint u;
   if (bavailr(b) >= 3)
     {
       b->bptr = utf8_get_repl(b->bptr, &u, repl);
@@ -35,10 +45,9 @@ bget_utf8_repl(struct fastbuf *b, uns repl)
     return bget_utf8_slow(b, repl);
 }
 
-static inline int
-bget_utf8_32_repl(struct fastbuf *b, uns repl)
+static inline int bget_utf8_32_repl(struct fastbuf *b, uint repl)
 {
-  uns u;
+  uint u;
   if (bavailr(b) >= 6)
     {
       b->bptr = utf8_32_get_repl(b->bptr, &u, repl);
@@ -58,7 +67,7 @@ static inline int bget_utf8_32(struct fastbuf *b) /** Read a single utf8 charact
   return bget_utf8_32_repl(b, UNI_REPLACEMENT);
 }
 
-static inline void bput_utf8(struct fastbuf *b, uns u) /** Write a single utf8 character from range [0, 0xffff]. **/
+static inline void bput_utf8(struct fastbuf *b, uint u) /** Write a single utf8 character from range [0, 0xffff]. **/
 {
   if (bavailw(b) >= 3)
     b->bptr = utf8_put(b->bptr, u);
@@ -66,7 +75,7 @@ static inline void bput_utf8(struct fastbuf *b, uns u) /** Write a single utf8 c
     bput_utf8_slow(b, u);
 }
 
-static inline void bput_utf8_32(struct fastbuf *b, uns u) /** Write a single utf8 character (from the whole unicode range). **/
+static inline void bput_utf8_32(struct fastbuf *b, uint u) /** Write a single utf8 character (from the whole unicode range). **/
 {
   if (bavailw(b) >= 6)
     b->bptr = utf8_32_put(b->bptr, u);
@@ -76,15 +85,14 @@ static inline void bput_utf8_32(struct fastbuf *b, uns u) /** Write a single utf
 
 /* ** UTF-16 ** */
 
-int bget_utf16_be_slow(struct fastbuf *b, uns repl);
-int bget_utf16_le_slow(struct fastbuf *b, uns repl);
-void bput_utf16_be_slow(struct fastbuf *b, uns u);
-void bput_utf16_le_slow(struct fastbuf *b, uns u);
+int bget_utf16_be_slow(struct fastbuf *b, uint repl);
+int bget_utf16_le_slow(struct fastbuf *b, uint repl);
+void bput_utf16_be_slow(struct fastbuf *b, uint u);
+void bput_utf16_le_slow(struct fastbuf *b, uint u);
 
-static inline int
-bget_utf16_be_repl(struct fastbuf *b, uns repl)
+static inline int bget_utf16_be_repl(struct fastbuf *b, uint repl)
 {
-  uns u;
+  uint u;
   if (bavailr(b) >= 4)
     {
       b->bptr = utf16_be_get_repl(b->bptr, &u, repl);
@@ -94,10 +102,9 @@ bget_utf16_be_repl(struct fastbuf *b, uns repl)
     return bget_utf16_be_slow(b, repl);
 }
 
-static inline int
-bget_utf16_le_repl(struct fastbuf *b, uns repl)
+static inline int bget_utf16_le_repl(struct fastbuf *b, uint repl)
 {
-  uns u;
+  uint u;
   if (bavailr(b) >= 4)
     {
       b->bptr = utf16_le_get_repl(b->bptr, &u, repl);
@@ -129,7 +136,7 @@ static inline int bget_utf16_le(struct fastbuf *b)
  * Write an utf16 character to fastbuf.
  * Big endian version.
  **/
-static inline void bput_utf16_be(struct fastbuf *b, uns u)
+static inline void bput_utf16_be(struct fastbuf *b, uint u)
 {
   if (bavailw(b) >= 4)
     b->bptr = utf16_be_put(b->bptr, u);
@@ -141,7 +148,7 @@ static inline void bput_utf16_be(struct fastbuf *b, uns u)
  * Write an utf16 character to fastbuf.
  * Little endian version.
  **/
-static inline void bput_utf16_le(struct fastbuf *b, uns u)
+static inline void bput_utf16_le(struct fastbuf *b, uint u)
 {
   if (bavailw(b) >= 4)
     b->bptr = utf16_le_put(b->bptr, u);