Changeset 263 for trunk/openjdk/jdk/src/windows/native

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

Files:

• UnicowsLoader.cpp (modified) (1 diff)
• awt_Mlib.cpp (modified) (1 diff)

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

@@ -77 +77 @@
     // an infinite loop if some W call were made inside AwtToolkit class
     // initialization.
+#ifdef __WIN32OS2__    
+    HMODULE hmodAWT = GetModuleHandleA("jawtos2");
+#else
     HMODULE hmodAWT = GetModuleHandleA("awt");
+#endif
     LPSTR abspath = static_cast<LPSTR>(safe_Malloc(MAX_PATH));
     if (abspath != NULL) {

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

@@ -50 +50 @@
          */
 #ifdef __WIN32OS2__         
-        hDLL = ::LoadLibrary(TEXT("mlibimg.dll"));
+        hDLL = ::LoadLibrary(TEXT("jmlibimg.dll"));
 #else
         hDLL = ::LoadLibrary(TEXT("mlib_image.dll"));