Context Navigation

share

Timestamp:

Jan 27, 2011, 6:22:28 PM (15 years ago)

Author:

dmik

Message:

jdk: Adopted JPDA to OS/2 and included in the build (closes #19).

Location:

trunk/openjdk/jdk/src/share

Files:

-              r2
+              r249
         TransportService ts = null;
+        if (lib.equals("dt_socket")) {
+        final String sockLib = System.getProperty("os.name").startsWith("OS/2") ? "dt_sock" : "dt_socket";
+        if (lib.equals(sockLib)) {
             ts = new SocketTransportService();
         } else {

r2	r249
71	71	transport = new Transport() {
72	72	public String name() {
	73	if (System.getProperty("os.name").startsWith("OS/2"))
	74	return "dt_sock";
73	75	return "dt_socket";
74	76	}

r2	r249
69	69	transport = new Transport() {
70	70	public String name() {
	71	if (System.getProperty("os.name").startsWith("OS/2"))
	72	return "dt_sock";
71	73	return "dt_socket"; // for compatability reasons
72	74	}

r2	r249
59	59	transport = new Transport() {
60	60	public String name() {
	61	if (System.getProperty("os.name").startsWith("OS/2"))
	62	return "dt_sock";
61	63	return "dt_socket"; // for compatability reasons
62	64	}

r2	r249
82	82	transport = new Transport() {
83	83	public String name() {
	84	if (System.getProperty("os.name").startsWith("OS/2"))
	85	return "dt_sock";
84	86	return "dt_socket";
85	87	}

-              r2
+              r249
 #include "jdwpTransport.h"  /* for Packet, TransportCallback */
+#ifndef MIN
 #define MIN(x,y) ((x)<(y)?(x):(y))
+#endif
 /*
 …
 } SharedListener;
 typedef struct SharedMemoryTransport {
+struct SharedMemoryTransport {
     char name[MAX_IPC_PREFIX];
     sys_ipmutex_t mutex;
 …
     sys_shmem_t sharedMemory;
     SharedListener *shared;
 } SharedMemoryTransport;
+};
 /*
 …
 typedef struct SharedMemoryConnection {
+struct SharedMemoryConnection {
     char name[MAX_IPC_NAME];
     SharedMemory *shared;
 …
     sys_process_t otherProcess;
     sys_event_t shutdown;           /* signalled to indicate shutdown */
 } SharedMemoryConnection;
+};
 static jdwpTransportCallback *callback;

Note: See TracChangeset for help on using the changeset viewer.