Changeset 263 for trunk/openjdk/hotspot/src/os

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)

File:

• trunk/openjdk/hotspot/src/os/windows/vm/hpi_windows.cpp (modified) (2 diffs)

trunk/openjdk/hotspot/src/os/windows/vm/hpi_windows.cpp

@@ -26 +26 @@
 # include "incls/_hpi_windows.cpp.incl"
 
+#ifdef __WIN32OS2__    
+# define HPI_LIBNAME "jhpi"
+#else
+# define HPI_LIBNAME "hpi"
+#endif
+
 typedef jint (JNICALL *init_t)(GetInterfaceFunc *, void *);
 
@@ -40 +46 @@
 
 #ifdef PRODUCT
-    const char *hpi_lib = "\\hpi.dll";
+    const char *hpi_lib = "\\" HPI_LIBNAME ".dll";
 #else
     char *ptr = strrchr(lib_name, '\\');
     //  On Win98 GetModuleFileName() returns the path in the upper case.
     assert(_strnicmp(ptr, "\\jvm",4) == 0, "invalid library name");
-    const char *hpi_lib = (_strnicmp(ptr, "\\jvm_g",6) == 0) ? "\\hpi_g.dll" : "\\hpi.dll";
+    const char *hpi_lib = (_strnicmp(ptr, "\\jvm_g",6) == 0) ?
+        "\\" HPI_LIBNAME "_g.dll" : "\\" HPI_LIBNAME ".dll";
 #endif