Fix:Android:Corrected and added keycodes

[navit-package] / navit / zipfile.h

diff --git a/navit/zipfile.h b/navit/zipfile.h
index 695576d..402c074 100644 (file)
--- a/navit/zipfile.h
+++ b/navit/zipfile.h
@@ -1,4 +1,31 @@
+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
 #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;
@@ -15,6 +42,8 @@ struct zip_lfh {
        char zipname[0];
 } __attribute__ ((packed));
 
+#define zip_cd_sig 0x02014b50
+
 struct zip_cd {
        int zipcensig;
        char zipcver;
@@ -38,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;
@@ -50,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