From: Martin Mares Date: Thu, 14 Sep 2006 11:44:04 +0000 (+0200) Subject: Avoid unnecessary include of bbuf.h in fastbuf.h. X-Git-Tag: holmes-import~512^2~4 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=26682bf24cf0899f149b49871c4ae6cf3fd1c740;p=libucw.git Avoid unnecessary include of bbuf.h in fastbuf.h. --- diff --git a/lib/fastbuf.h b/lib/fastbuf.h index 26d829ab..922798ff 100644 --- a/lib/fastbuf.h +++ b/lib/fastbuf.h @@ -19,7 +19,6 @@ #include #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 cb41b8c7..c8fa0fb3 100644 --- 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;