Changeset 96

Timestamp:

Aug 9, 2010, 9:02:40 PM (15 years ago)

Author:

dmik

Message:

jdk: Made zip.dll build on OS/2.

Location:

trunk/openjdk/jdk

Files:

• make/java/zip/Makefile (modified) (3 diffs)
• src/share/native/java/util/zip/zip_util.c (modified) (1 diff)

trunk/openjdk/jdk/make/java/zip/Makefile

@@ -48 +48 @@
         java/util/jar/JarFile.java
 
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
 OTHER_CFLAGS += -DUSE_MMAP
-else
+endif
+ifeq ($(PLATFORM), windows)
   # Files built here do not compile with warning level 3 if warnings are fatal
   COMPILER_WARNINGS_FATAL=false
@@ -63 +64 @@
   endif
 endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
 
 ifeq ($(PLATFORM), windows)
@@ -70 +69 @@
             -export:ZIP_ReadEntry -export:ZIP_GetNextEntry
 else
+ifeq ($(PLATFORM), os2)
+# exports live in .def file
+DEF_FILE = $(OBJDIR)/$(LIBRARY).def
+$(DEF_FILE): $(MAKEFILE)
+        @$(ECHO) 'EXPORTS \n \
+  ZIP_Open = "_ZIP_Open@8" \n \
+  ZIP_Close = "_ZIP_Close@4" \n \
+  ZIP_FindEntry = "_ZIP_FindEntry@16" \n \
+  ZIP_ReadEntry = "_ZIP_ReadEntry@16" \n \
+  ZIP_GetNextEntry = "_ZIP_GetNextEntry@8" \n \
+' > $@
+clean::
+        -$(RM) $(DEF_FILE)
+else
 CPPFLAGS += -UDEBUG 
 endif
+endif
+
+include $(BUILDDIR)/common/Mapfile-vers.gmk
+include $(BUILDDIR)/common/Library.gmk
 
 CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)

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

@@ -143 +143 @@
 static int
 ZFILE_read(ZFILE zfd, char *buf, jint nbytes) {
-#ifdef WIN32
+#if defined(WIN32) || defined(__OS2__)
     return (int) IO_Read(zfd, buf, nbytes);
 #else