extern variable declaration in a .c file is heresy - fixing it

3 files changed, 9 insertions, 5 deletions

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 09f89e25c..83261de6d 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -45,8 +45,11 @@ typedef struct huft_s {
         } v;
 } huft_t;
 
+/* Globally-visible data */
+off_t gunzip_bytes_out; /* number of output bytes */
+uint32_t gunzip_crc;
+
 static int gunzip_src_fd;
-unsigned int gunzip_bytes_out;  /* number of output bytes */
 static unsigned int gunzip_outbuf_count;        /* bytes in output buffer */
 
 /* gunzip_window size--must be a power of two, and
@@ -55,7 +58,6 @@ enum { gunzip_wsize = 0x8000 };
 static unsigned char *gunzip_window;
 
 static uint32_t *gunzip_crc_table;
-uint32_t gunzip_crc;
 
 /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
 #define BMAX 16 /* maximum bit length of any code (16 for explode) */
diff --git a/archival/unzip.c b/archival/unzip.c
index 570789427..34a3a8519 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -32,9 +32,6 @@
 #define ZIP_CDS_END_MAGIC               SWAP_LE32(0x06054b50)
 #define ZIP_DD_MAGIC                    SWAP_LE32(0x08074b50)
 
-extern unsigned int gunzip_crc;
-extern unsigned int gunzip_bytes_out;
-
 typedef union {
         unsigned char raw[26];
         struct {
diff --git a/include/unarchive.h b/include/unarchive.h
index 88c00882c..843f68f73 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -64,6 +64,11 @@ typedef struct archive_handle_s {
 
 } archive_handle_t;
 
+
+extern uint32_t gunzip_crc;
+extern off_t gunzip_bytes_out;
+
+
 extern archive_handle_t *init_handle(void);
 
 extern char filter_accept_all(archive_handle_t *archive_handle);