Adapted to new unicode includes.

diff --git a/lib/buck2obj.c b/lib/buck2obj.c
index 3e7b78fc96ab532994013ec711f4d8b9768f9ac6..52be40d82e1df021e7a2cd0f0bb42bb15eb8ff6f 100644 (file)
--- a/lib/buck2obj.c
+++ b/lib/buck2obj.c
@@ -9,7 +9,7 @@
 #include "lib/unaligned.h"
 #include "lib/pools.h"
 #include "lib/fastbuf.h"
-#include "charset/unicode.h"
+#include "lib/unicode.h"
 #include "lib/object.h"
 #include "lib/bucket.h"
 #include "lib/lizard.h"

diff --git a/lib/buckettool.c b/lib/buckettool.c
index 9e253e6e9ace7080a561c08baaf99b7e856a006c..f22f17f90691e53ab164dfb97970f99710fc570b 100644 (file)
--- a/lib/buckettool.c
+++ b/lib/buckettool.c
@@ -17,7 +17,7 @@
 #include "lib/object.h"
 #include "lib/lizard.h"
 #include "lib/bbuf.h"
-#include "charset/unistream.h"
+#include "lib/ff-utf8.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/lib/obj2buck.c b/lib/obj2buck.c
index 7fee3d54a145a663aad7ca1393697a2cdcd24d93..9198fad56ec4c449243c21da264a044533b50a81 100644 (file)
--- a/lib/obj2buck.c
+++ b/lib/obj2buck.c
@@ -9,9 +9,9 @@
 
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
+#include "lib/ff-utf8.h"
 #include "lib/bucket.h"
 #include "lib/object.h"
-#include "charset/unistream.h"
 
 #include <string.h>
 #include <stdarg.h>

diff --git a/lib/tagged-text.h b/lib/tagged-text.h
index 97c07eeb2649fe36c40fee8d136283b8785c5a0d..29ba1d8e2c4516e229f1c21282f1cf01022f0f76 100644 (file)
--- a/lib/tagged-text.h
+++ b/lib/tagged-text.h
@@ -8,7 +8,7 @@
 #define _SHERLOCK_TAGGED_TEXT_H
 
 #include "lib/fastbuf.h"
-#include "charset/unistream.h"
+#include "lib/ff-utf8.h"
 
 /* Reading of tagged text (Unicode values, tags mapped to 0x80000000 and higher) */