Subo BS (Merge con exito!)

[z.facultad/75.06/jacu.git] / src / blocksorting / bs.h

diff --git a/src/blocksorting/bs.h b/src/blocksorting/bs.h
index 7e686ee5142312bdcda2224e67d376180562eb58..d3c47c9ec365c18af7a0eb6d55d65876a560c4c2 100644 (file)
--- a/src/blocksorting/bs.h
+++ b/src/blocksorting/bs.h
@@ -6,7 +6,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifndef Uint32
 typedef unsigned long int Uint32;
+#endif
 
 typedef struct _bs_t_ t_BlockSort;
 
@@ -56,7 +58,9 @@ void bs_solve(char *in, char *out, t_BlockSort *bs, Uint32 *k, Uint32 leido);
  */
 void bs_restore(char *dst, char *c, Uint32 k, Uint32 len);
 
-int bs_readblock(FILE *fp, char *data, Uint32 pagesize);
+int bs_readblock(FILE *fp, char *data, Uint32 pagesize, int usar_dic);
+
+char *bs_finalblock(char *data, Uint32 len, Uint32 *new_size);
 
 #endif