Ignore:
Timestamp:
Feb 21, 2011, 12:02:20 AM (14 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/windows
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java

    r2 r263  
    5151        transport = new Transport() {
    5252            public String name() {
     53                if (System.getProperty("os.name").startsWith("OS/2"))
     54                    return "jdtshmem";
    5355                return "dt_shmem";              // for compatability reasons
    5456            }

  • trunk/openjdk/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java

    r2 r263  
    5050        transport = new Transport() {
    5151            public String name() {
     52                if (System.getProperty("os.name").startsWith("OS/2"))
     53                    return "jdtshmem";
    5254                return "dt_shmem";              // compatability
    5355            }

  • trunk/openjdk/jdk/src/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java

    r2 r263  
    6767
    6868    SharedMemoryTransportService() {
    69         System.loadLibrary("dt_shmem");
     69        final String shmemLib =
     70            System.getProperty("os.name").startsWith("OS/2") ? "jdtshmem"
     71                                                             : "dt_shmem";
     72        System.loadLibrary(shmemLib);
    7073        initialize();
    7174    }

  • trunk/openjdk/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java

    r2 r263  
    3434import java.util.*;
    3535import sun.security.action.LoadLibraryAction;
     36import sun.security.action.GetPropertyAction;
    3637
    3738import static sun.awt.shell.Win32ShellFolder2.*;
    … …  
    5253    static {
    5354        // Load library here
    54         AccessController.doPrivileged(new LoadLibraryAction("awt"));
     55        boolean isOS2 = AccessController.doPrivileged(new GetPropertyAction("os.name")).startsWith("OS/2");
     56        AccessController.doPrivileged(new LoadLibraryAction(isOS2 ? "jawtos2" : "awt"));
    5557    }
    5658

  • trunk/openjdk/jdk/src/windows/classes/sun/awt/windows/WToolkit.java

    r2 r263  
    8787    public static void loadLibraries() {
    8888        if (!loaded) {
     89            boolean isOS2 = java.security.AccessController.doPrivileged(
     90                new sun.security.action.GetPropertyAction("os.name")).
     91                    startsWith("OS/2");
    8992            java.security.AccessController.doPrivileged(
    90                           new sun.security.action.LoadLibraryAction("awt"));
     93                new sun.security.action.LoadLibraryAction(isOS2 ? "jawtos2"
     94                                                                : "awt"));
    9195            loaded = true;
    9296        }

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

    r2 r263  
    160160
    161161    static {
     162        boolean isOS2 = java.security.AccessController.doPrivileged(
     163            new sun.security.action.GetPropertyAction("os.name")).
     164                startsWith("OS/2");
    162165        java.security.AccessController.doPrivileged(
    163             new sun.security.action.LoadLibraryAction("net"));
     166            new sun.security.action.LoadLibraryAction(isOS2 ? "jnet"
     167                                                            : "net"));
    164168        init0();
    165169

  • trunk/openjdk/jdk/src/windows/classes/sun/print/Win32PrintServiceLookup.java

    r2 r263  
    5656
    5757    static {
     58        boolean isOS2 = java.security.AccessController.doPrivileged(
     59            new sun.security.action.GetPropertyAction("os.name")).
     60                startsWith("OS/2");
    5861        java.security.AccessController.doPrivileged(
    59                     new sun.security.action.LoadLibraryAction("awt"));
     62            new sun.security.action.LoadLibraryAction(isOS2 ? "jawtos2"
     63                                                            : "awt"));
    6064    }
    6165

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

    r203 r263  
    5252            public Object run() {
    5353                if (System.getProperty("os.name").startsWith("OS/2")) {
    54                     System.loadLibrary("smscapi");
     54                    System.loadLibrary("jsmscapi");
    5555                } else {
    5656                    System.loadLibrary("sunmscapi");

  • trunk/openjdk/jdk/src/windows/native/sun/windows/UnicowsLoader.cpp

    r195 r263  
    7777    // an infinite loop if some W call were made inside AwtToolkit class
    7878    // initialization.
     79#ifdef __WIN32OS2__   
     80    HMODULE hmodAWT = GetModuleHandleA("jawtos2");
     81#else
    7982    HMODULE hmodAWT = GetModuleHandleA("awt");
     83#endif
    8084    LPSTR abspath = static_cast<LPSTR>(safe_Malloc(MAX_PATH));
    8185    if (abspath != NULL) {

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

    r203 r263  
    5050         */
    5151#ifdef __WIN32OS2__         
    52         hDLL = ::LoadLibrary(TEXT("mlibimg.dll"));
     52        hDLL = ::LoadLibrary(TEXT("jmlibimg.dll"));
    5353#else
    5454        hDLL = ::LoadLibrary(TEXT("mlib_image.dll"));

  • trunk/openjdk/jdk/src/windows/npt/npt_md.h

    r2 r263  
    3434#include <errno.h>
    3535
     36#ifdef __WIN32OS2__
     37#define NPT_LIBNAME "jnpt.dll"
     38#else
    3639#define NPT_LIBNAME "npt.dll"
     40#endif
    3741
    3842#define NPT_INITIALIZE(pnpt,version,options)                            \
Note: See TracChangeset for help on using the changeset viewer.