Fixed types in types.h to use C99 standard types, also removed all references

[virtualjaguar] / src / unzip.h

diff --git a/src/unzip.h b/src/unzip.h
index 16654ca6cb340d8e5557369d119ee49908ee51af..513719279d628333dbf25342c089c21b4bf076fe 100644 (file)
--- a/src/unzip.h
+++ b/src/unzip.h
@@ -1,8 +1,9 @@
 #ifndef __UNZIP_H__
 #define __UNZIP_H__
 
-#include "types.h"
+//#include "types.h"
 #include <stdio.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,25 +15,25 @@ extern "C" {
 
 struct zipent
 {
-       UINT32  cent_file_header_sig;
-       UINT8   version_made_by;
-       UINT8   host_os;
-       UINT8   version_needed_to_extract;
-       UINT8   os_needed_to_extract;
-       UINT16  general_purpose_bit_flag;
-       UINT16  compression_method;
-       UINT16  last_mod_file_time;
-       UINT16  last_mod_file_date;
-       UINT32  crc32;
-       UINT32  compressed_size;
-       UINT32  uncompressed_size;
-       UINT16  filename_length;
-       UINT16  extra_field_length;
-       UINT16  file_comment_length;
-       UINT16  disk_number_start;
-       UINT16  internal_file_attrib;
-       UINT32  external_file_attrib;
-       UINT32  offset_lcl_hdr_frm_frst_disk;
+       uint32_t        cent_file_header_sig;
+       uint8_t version_made_by;
+       uint8_t host_os;
+       uint8_t version_needed_to_extract;
+       uint8_t os_needed_to_extract;
+       uint16_t        general_purpose_bit_flag;
+       uint16_t        compression_method;
+       uint16_t        last_mod_file_time;
+       uint16_t        last_mod_file_date;
+       uint32_t        crc32;
+       uint32_t        compressed_size;
+       uint32_t        uncompressed_size;
+       uint16_t        filename_length;
+       uint16_t        extra_field_length;
+       uint16_t        file_comment_length;
+       uint16_t        disk_number_start;
+       uint16_t        internal_file_attrib;
+       uint32_t        external_file_attrib;
+       uint32_t        offset_lcl_hdr_frm_frst_disk;
        char *  name; /* 0 terminated */
 };
 
@@ -48,14 +49,14 @@ typedef struct _ZIP
        unsigned cd_pos;                        /* position in cent_dir */
        struct zipent ent;                      /* buffer for readzip */
        /* end_of_cent_dir */
-       UINT32  end_of_cent_dir_sig;
-       UINT16  number_of_this_disk;
-       UINT16  number_of_disk_start_cent_dir;
-       UINT16  total_entries_cent_dir_this_disk;
-       UINT16  total_entries_cent_dir;
-       UINT32  size_of_cent_dir;
-       UINT32  offset_to_start_of_cent_dir;
-       UINT16  zipfile_comment_length;
+       uint32_t        end_of_cent_dir_sig;
+       uint16_t        number_of_this_disk;
+       uint16_t        number_of_disk_start_cent_dir;
+       uint16_t        total_entries_cent_dir_this_disk;
+       uint16_t        total_entries_cent_dir;
+       uint32_t        size_of_cent_dir;
+       uint32_t        offset_to_start_of_cent_dir;
+       uint16_t        zipfile_comment_length;
        char *  zipfile_comment;        /* pointer in ecd */
 } ZIP;
 
@@ -100,7 +101,7 @@ void rewindzip(ZIP * zip);
      zip opened zip
      ent entry to read
    out:
-     data buffer for data, ent.compressed_size UINT8s allocated by the caller
+     data buffer for data, ent.compressed_size uint8_ts allocated by the caller
    return:
      ==0 success
      <0 error
@@ -112,7 +113,7 @@ int readcompresszip(ZIP * zip, struct zipent * ent, char * data);
      zip zip stream open
      ent entry to read
    out:
-     data buffer for data, ent.uncompressed_size UINT8s allocated by the caller
+     data buffer for data, ent.uncompressed_size uint8_ts allocated by the caller
    return:
      ==0 success
      <0 error
@@ -121,7 +122,7 @@ int readuncompresszip(ZIP * zip, struct zipent * ent, char * data);
 
 /* public functions */
 int /* error */ load_zipped_file(int pathtype, int pathindex, const char * zipfile, const char * filename,
-       unsigned char ** buf, uint32 * length);
+       unsigned char ** buf, uint32_t * length);
 
 void unzip_cache_clear(void);