Merge branch 'dev-uint'

[libucw.git] / ucw / ff-varint.h

diff --git a/ucw/ff-varint.h b/ucw/ff-varint.h
index 2913267943ba9fad97cc186993ac7f9151caa175..fad39854bbd1f09913a49d405709137b15bd667f 100644 (file)
--- a/ucw/ff-varint.h
+++ b/ucw/ff-varint.h
@@ -13,6 +13,11 @@
 #include <ucw/fastbuf.h>
 #include <ucw/varint.h>
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bget_varint_slow ucw_bget_varint_slow
+#define bput_varint_slow ucw_bput_varint_slow
+#endif
+
 u64 bget_varint_slow(struct fastbuf *b, u64 repl);
 void bput_varint_slow(struct fastbuf *b, u64 u);
 
@@ -22,7 +27,7 @@ void bput_varint_slow(struct fastbuf *b, u64 u);
  **/
 static inline u64 bget_varint_repl(struct fastbuf *b, u64 repl)
 {
-       uns l;
+       uint l;
        if (bavailr(b) >= 1) {
                l = varint_len(*b->bptr);
                if (bavailr(b) >= l) {
@@ -46,7 +51,7 @@ static inline u64 bget_varint(struct fastbuf *b)
 /** Writes u64 u encoded as varint to the fastbuf b. **/
 static inline void bput_varint(struct fastbuf *b, u64 u)
 {
-       uns l = varint_space(u);
+       uint l = varint_space(u);
        if (bavailw(b) >= l)
                b->bptr += varint_put(b->bptr, u);
        else