merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/Install/inczip/zip.h

@@ -0,0 +1,15 @@
+/* This is a dummy zip.h to allow the source files shared with Zip (crypt.c,
+   crc32.c, crctab.c, ttyio.c) to compile for UnZip.  */
+
+#ifndef __zip_h   /* don't include more than once */
+#define __zip_h
+
+#define UNZIP_INTERNAL
+#include "unzip.h"
+
+#define local static
+
+#define ZE_MEM         PK_MEM
+#define ziperr(c, h)   return
+
+#endif /* !__zip_h */