Merging upstream version 1.16~pre2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 5 insertions, 3 deletions

diff --git a/lzip.h b/lzip.h
index 483835f..cd44b42 100644
--- a/lzip.h
+++ b/lzip.h
@@ -279,9 +279,13 @@ inline unsigned long long positive_diff( const unsigned long long x,
 
 
 // defined in decoder.cc
-int readblock( const int fd, uint8_t * const buf, const int size );
+long readblock( const int fd, uint8_t * const buf, const long size );
 int writeblock( const int fd, const uint8_t * const buf, const int size );
 
+// defined in file_index.cc
+int seek_read( const int fd, uint8_t * const buf, const int size,
+               const long long pos );
+
 // defined in main.cc
 int open_instream( const char * const name, struct stat * const in_statsp,
                    const bool no_ofile, const bool reg_only = false );
@@ -314,8 +318,6 @@ int range_decompress( const std::string & input_filename,
                       const bool force, const bool ignore, const bool to_stdout );
 
 // defined in repair.cc
-int seek_read( const int fd, uint8_t * const buf, const int size,
-               const long long pos );
 int repair_file( const std::string & input_filename,
                  const std::string & output_filename, const int verbosity,
                  const bool force );