Avoid unnecessary include of bbuf.h in fastbuf.h.

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 26d829ab8834977e56b69958c9802890318fbf6e..922798ff183515a3d102191c6e614569373088e1 100644 (file)
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -19,7 +19,6 @@
 #include <alloca.h>
 
 #include "lib/unaligned.h"
-#include "lib/bbuf.h"
 
 /*
  *  Generic buffered I/O. You supply hooks to be called for low-level operations
@@ -342,7 +341,8 @@ int bgets_nodie(struct fastbuf *f, byte *b, uns l);
 byte *bgets0(struct fastbuf *f, byte *b, uns l);
 
 struct mempool;
-uns bgets_bb(struct fastbuf *f, bb_t *b, uns limit);
+struct bb_t;
+uns bgets_bb(struct fastbuf *f, struct bb_t *b, uns limit);
 byte *bgets_mp(struct fastbuf *f, struct mempool *mp);
 
 struct bgets_stk_struct {

diff --git a/lib/ff-string.c b/lib/ff-string.c
index cb41b8c7c0f5ffa73a23f1b229f7f9874af433e9..c8fa0fb35b48cc06a4bc44c6ee4280af5587f2ff 100644 (file)
--- a/lib/ff-string.c
+++ b/lib/ff-string.c
@@ -11,6 +11,7 @@
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
 #include "lib/mempool.h"
+#include "lib/bbuf.h"
 
 byte *                                 /* Non-standard */
 bgets(struct fastbuf *f, byte *b, uns l)
@@ -79,7 +80,7 @@ exit:
 }
 
 uns
-bgets_bb(struct fastbuf *f, bb_t *bb, uns limit)
+bgets_bb(struct fastbuf *f, struct bb_t *bb, uns limit)
 {
   ASSERT(limit);
   byte *src;