X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=dehuff.h;h=6865dae0d7169bbe62b390e86c662d8c6439b13a;hp=d93e7931ee17f081e734e7ff5397dd2f973f200d;hb=4ccaf2a2ac9f78dcaaa1ba4a093b1ece3f915c94;hpb=618548d1f2e076a3da21368e708cf887dcbd20d2

diff --git a/dehuff.h b/dehuff.h
index d93e793..6865dae 100644
--- a/dehuff.h
+++ b/dehuff.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "bytesource.h"
 #include "input.h"
 
 // About 99% of all Huffman codes are <= 8 bits long (see codelen.txt),
@@ -13,11 +14,6 @@
 #define DEHUF_TABLE_SIZE (1 << DEHUF_TABLE_BITS)
 static const int DEHUF_SLOW_PATH = -1;
 
-// A function to read bytes from some input source. The bytes should be
-// already unstuffed (and thus without markers).
-// A return value of -1 indicates error, a return value of 0 indicates EOF.
-typedef ssize_t (raw_input_func_t)(void*, uint8_t*, size_t);
-
 struct huffman_table {
 	unsigned num_codes[17];     // BITS
 	unsigned char codes[256];   // HUFFVAL