Changeset 99

Timestamp:

Aug 10, 2010, 8:01:22 PM (15 years ago)

Author:

dmik

Message:

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

Location:

trunk/openjdk/jdk

Files:

• make/java/java_hprof_demo/Makefile (modified) (2 diffs)
• src/windows/demo/jvmti/hprof/hprof_md.c (modified) (2 diffs)

trunk/openjdk/jdk/make/java/java_hprof_demo/Makefile

@@ -81 +81 @@
                  -I$(SHARE_SRC)/demo/jvmti/java_crw_demo
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),)
+ifeq ($(PLATFORM), windows)
   OTHER_LDLIBS += wsock32.lib winmm.lib
 else
+ifeq ($(PLATFORM), os2)
+  OTHER_LDLIBS += -lwsock32.lib -lwinmm.lib
+else
   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
+endif
 endif
 
@@ -113 +117 @@
 # Add to ambient vpath so we pick up the library files
 #
-vpath %.c $(SRCDIR):$(PSRCDIR)
+vpath %.c $(SRCDIR) $(PSRCDIR)
 
 #

trunk/openjdk/jdk/src/windows/demo/jvmti/hprof/hprof_md.c

@@ -31 +31 @@
 
 #include <windows.h>
+#ifndef __WIN32OS2__
 #include <io.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -41 +43 @@
 #include "jni.h"
 #include "hprof.h"
+
+#ifdef __EMX__
+#include <unistd.h>
+#define _S_IREAD    S_IRUSR
+#define _S_IWRITE   S_IWUSR
+#define _S_IEXEC    S_IXUSR
+#define _lseeki64   lseek
+#endif
 
 int