X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=charset%2Ffb-charconv.c;h=252e899466db82d1c46d3ef6e50d754e5ed7ba32;hb=06dcd3ee2abfe6a101d3d609e17bccac56d7202d;hp=9a36590aeb64f2b1746da03bd8fcd0e63a9220b0;hpb=bd58fbd275d46c3828e1f46a1ca9a3e4b5fe5a28;p=libucw.git

diff --git a/charset/fb-charconv.c b/charset/fb-charconv.c
index 9a36590a..252e8994 100644
--- a/charset/fb-charconv.c
+++ b/charset/fb-charconv.c
@@ -7,12 +7,10 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/fastbuf.h"
-#include "charset/charconv.h"
-#include "charset/fb-charconv.h"
-
-#include <stdlib.h>
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <charset/charconv.h>
+#include <charset/fb-charconv.h>
 
 #define BUFSIZE 1024
 
@@ -22,7 +20,7 @@ struct fb_charconv {
   struct conv_context ctxt;
   byte buf[BUFSIZE];
 };
-#define FB_CC(f) ((struct fb_charconv *)(f)->is_fastbuf)
+#define FB_CC(f) ((struct fb_charconv *)(f))
 
 static void
 fb_cc_spout(struct fastbuf *f)