Fix:maptool:Another name for faroe islands

[navit-package] / navit / zipfile.h

diff --git a/navit/zipfile.h b/navit/zipfile.h
index 24e580e..402c074 100644 (file)
--- a/navit/zipfile.h
+++ b/navit/zipfile.h
@@ -18,6 +18,14 @@
  */
 
 #ifndef __ZIPFILE_H__
+#ifdef HAVE_API_WIN32_CE
+#warning OK
+/* cegcc doesn't honor the __attribute__(packed) need pragma to work */
+#pragma pack(push)
+#pragma pack(1)
+#endif
+
+#define zip_lfh_sig 0x04034b50
 
 struct zip_lfh {
        int ziplocsig;
@@ -34,6 +42,8 @@ struct zip_lfh {
        char zipname[0];
 } __attribute__ ((packed));
 
+#define zip_cd_sig 0x02014b50
+
 struct zip_cd {
        int zipcensig;
        char zipcver;
@@ -57,6 +67,14 @@ struct zip_cd {
        char zipcfn[0]; 
 } __attribute__ ((packed));
 
+#define zip_eoc_sig 0x6054b50
+
+struct zip_cd_ext {
+       short tag;
+       short size;
+       unsigned long long zipofst;
+} __attribute__ ((packed));
+
 struct zip_eoc {
        int zipesig;
        unsigned short zipedsk;
@@ -69,6 +87,16 @@ struct zip_eoc {
        char zipecom[0];
 } __attribute__ ((packed));
 
+struct zip64_eocl {
+       int zip64lsig;
+       int zip64ldsk;
+       long long zip64lofst;
+       int zip74lnum;
+} __attribute__ ((packed));
+
 #define __ZIPFILE_H__
+#ifdef __CEGCC__
+#pragma pack(pop)
+#endif
 
 #endif