Ignore:
Timestamp:
Feb 21, 2011, 12:02:20 AM (15 years ago)
Author:
dmik
Message:

make: Global DLL rename by adding the 'j' prefix to avoid possible conflicts with system DLLs (#52)

Location:
trunk/openjdk/jdk/src/solaris/classes/sun
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java

    r2 r263  
    244244
    245245    static {
     246        boolean isOS2 = java.security.AccessController.doPrivileged(
     247            new sun.security.action.GetPropertyAction("os.name")).
     248                startsWith("OS/2");
    246249        java.security.AccessController.doPrivileged(
    247             new sun.security.action.LoadLibraryAction("net"));
     250            new sun.security.action.LoadLibraryAction(isOS2 ? "jnet"
     251                                                            : "net"));
    248252    }
    249253

  • trunk/openjdk/jdk/src/solaris/classes/sun/print/CUPSPrinter.java

    r2 r263  
    7777    static {
    7878        // load awt library to access native code
     79        boolean isOS2 = java.security.AccessController.doPrivileged(
     80            new sun.security.action.GetPropertyAction("os.name")).
     81                startsWith("OS/2");
    7982        java.security.AccessController.doPrivileged(
    80             new sun.security.action.LoadLibraryAction("awt"));
     83            new sun.security.action.LoadLibraryAction(isOS2 ? "jawtos2"
     84                                                            : "awt"));
    8185        libFound = initIDs();
    8286        if (libFound) {
Note: See TracChangeset for help on using the changeset viewer.