Changeset 102

Timestamp:

Aug 17, 2010, 12:11:43 AM (15 years ago)

Author:

dmik

Message:

jdk: zip.dll: Use HANDLE-based file access everywhere (fixes inability to read .jar files)

File:

• trunk/openjdk/jdk/src/share/native/java/util/zip/zip_util.c (modified) (3 diffs)

trunk/openjdk/jdk/src/share/native/java/util/zip/zip_util.c

@@ -88 +88 @@
 static ZFILE
 ZFILE_Open(const char *fname, int flags) {
-#ifdef WIN32
+#if defined(WIN32) || defined (__WIN32OS2__)
     const DWORD access =
         (flags & O_RDWR)   ? (GENERIC_WRITE | GENERIC_READ) :
@@ -129 +129 @@
 static void
 ZFILE_Close(ZFILE zfd) {
-#ifdef WIN32
+#if defined(WIN32) || defined (__WIN32OS2__)
     CloseHandle((HANDLE) zfd);
 #else
@@ -143 +143 @@
 static int
 ZFILE_read(ZFILE zfd, char *buf, jint nbytes) {
-#if defined(WIN32) || defined(__OS2__)
+#if defined(WIN32) || defined (__WIN32OS2__)
     return (int) IO_Read(zfd, buf, nbytes);
 #else