Changeset 203 for trunk/openjdk/jdk/src

Timestamp:

Dec 8, 2010, 10:53:37 PM (15 years ago)

Author:

dmik

Message:

jdk: Shortened 5 other DLL names.

Location:

trunk/openjdk/jdk/src

Files:

• share/classes/sun/awt/image/ImagingLib.java (modified) (1 diff)
• share/classes/sun/instrument/InstrumentationImpl.java (modified) (1 diff)
• share/classes/sun/management/ManagementFactory.java (modified) (1 diff)
• share/classes/sun/tools/attach/HotSpotVirtualMachine.java (modified) (1 diff)
• share/demo/jvmti/hprof/hprof_init.c (modified) (1 diff)
• windows/classes/sun/security/mscapi/SunMSCAPI.java (modified) (1 diff)
• windows/native/sun/windows/awt_Mlib.cpp (modified) (1 diff)

trunk/openjdk/jdk/src/share/classes/sun/awt/image/ImagingLib.java

@@ -97 +97 @@
                     if (arch == null || !arch.startsWith("sparc")) {
                         try {
-                            System.loadLibrary("mlib_image");
+                            if (System.getProperty("os.name").startsWith("OS/2")) {
+                                System.loadLibrary("mlibimg");
+                            } else {
+                                System.loadLibrary("mlib_image");
+                            }
                         } catch (UnsatisfiedLinkError e) {
                             return Boolean.FALSE;

trunk/openjdk/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java

@@ -272 +272 @@
 
     static {
-        System.loadLibrary("instrument");
+        if (System.getProperty("os.name").startsWith("OS/2")) {
+            System.loadLibrary("instrmnt");
+        } else {
+            System.loadLibrary("instrument");
+        }
     }
 

trunk/openjdk/jdk/src/share/classes/sun/management/ManagementFactory.java

@@ -483 +483 @@
 
     static {
-        AccessController.doPrivileged(new LoadLibraryAction("management"));
+        if (System.getProperty("os.name").startsWith("OS/2")) {
+            AccessController.doPrivileged(new LoadLibraryAction("mngemnt"));
+        } else {
+            AccessController.doPrivileged(new LoadLibraryAction("management"));
+        }
         jvm = new VMManagementImpl();
     }

trunk/openjdk/jdk/src/share/classes/sun/tools/attach/HotSpotVirtualMachine.java

@@ -101 +101 @@
         }
         try {
-            loadAgentLibrary("instrument", args);
+            if (System.getProperty("os.name").startsWith("OS/2")) {
+                loadAgentLibrary("instrmnt", args);
+            } else {
+                loadAgentLibrary("instrument", args);
+            }
         } catch (AgentLoadException x) {
             throw new InternalError("instrument library is missing in target VM");

trunk/openjdk/jdk/src/share/demo/jvmti/hprof/hprof_init.c

@@ -2030 +2030 @@
 
         /* Load the library or get the handle to it */
+#ifdef OS2        
+        gdata->java_crw_demo_library = load_library("javacrwd");
+#else
         gdata->java_crw_demo_library = load_library("java_crw_demo");
-
+#endif
         { /* "java_crw_demo" */
             static char *symbols[]  = JAVA_CRW_DEMO_SYMBOLS;

trunk/openjdk/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java

@@ -51 +51 @@
         AccessController.doPrivileged(new PrivilegedAction() {
             public Object run() {
-                System.loadLibrary("sunmscapi");
+                if (System.getProperty("os.name").startsWith("OS/2")) {
+                    System.loadLibrary("smscapi");
+                } else {
+                    System.loadLibrary("sunmscapi");
+                }
                 return null;
             }

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Mlib.cpp

@@ -49 +49 @@
          * initialize the pointers to required mlib routines.
          */
+#ifdef __WIN32OS2__         
+        hDLL = ::LoadLibrary(TEXT("mlibimg.dll"));
+#else
         hDLL = ::LoadLibrary(TEXT("mlib_image.dll"));
-
+#endif
         if (hDLL == NULL) {
             return MLIB_FAILURE;