Context Navigation

Changeset 203

Timestamp:

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

Author:

dmik

Message:

jdk: Shortened 5 other DLL names.

Location:

trunk/openjdk/jdk

Files:

r107	r203
31	31	LIBRARY = instrument
32	32	PRODUCT = sun
	33
	34	LIBRARY_SHORT = instrmnt
33	35
34	36	# Configure the CFLAGS for this library. Use static binding so that there

r2	r203
28	28	PRODUCT = sun
29	29	LIBRARY_OUTPUT = java_crw_demo
	30
	31	LIBRARY_SHORT = javacrwd
30	32
31	33	# Configure the CFLAGS for this library.

-              r74
+              r203
 LIBRARY = management
 PRODUCT = java
+LIBRARY_SHORT = mngemnt
 include $(BUILDDIR)/common/Defs.gmk

-              r2
+              r203
 LIBRARY = mlib_image
 PRODUCT = sun
+LIBRARY_SHORT = mlibimg
 include $(BUILDDIR)/common/Defs.gmk

-              r2
+              r203
                     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;

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

-              r2
+              r203
     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();
+    }

-              r2
+              r203
+        }
         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");

-              r2
+              r203
         /* 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;

-              r2
+              r203
         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;
+            }

-              r2
+              r203
          * 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;

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