Changeset 203 for trunk/openjdk/jdk/src/windows

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/windows

Files:

• classes/sun/security/mscapi/SunMSCAPI.java (modified) (1 diff)
• native/sun/windows/awt_Mlib.cpp (modified) (1 diff)

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;