Changeset 112

Timestamp:

Aug 24, 2010, 1:52:33 AM (15 years ago)

Author:

dmik

Message:

hotspot: Renamed os_os2.cpp to os_os2_init.cpp.

File:

• trunk/openjdk/hotspot/src/os/os2/vm/os_os2_init.cpp (moved) (moved from trunk/openjdk/hotspot/src/os/os2/vm/os_os2.cpp ) (3 diffs)

trunk/openjdk/hotspot/src/os/os2/vm/os_os2_init.cpp

@@ -2 +2 @@
  * Copyright 1997-2010 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2010 netlabs.org. OS/2 Parts.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23 +25 @@
  */
 
-// As the OS/2 platform currently reuses the Windows sources, here we only
-// redirect the OS/2 DLL initialization/termination calls to DllMain()
-
-#ifdef __WIN32OS2__
+// This code redirects the OS/2 DLL initialization/termination calls to
+// the Windows DllMain()
 
 #include <os2.h> // Odin32 OS/2 api wrappers
@@ -49 +49 @@
 unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long ulFlag)
 {
-  size_t i;
-  APIRET rc;
+    size_t i;
+    APIRET rc;
 
-  // If ulFlag is zero then the DLL is being loaded so initialization should
-  // be performed.  If ulFlag is 1 then the DLL is being freed so termination
-  // should be performed. A non-zero value must be returned to indicate success.
+    // If ulFlag is zero then the DLL is being loaded so initialization should
+    // be performed.  If ulFlag is 1 then the DLL is being freed so termination
+    // should be performed. A non-zero value must be returned to indicate success.
 
-  switch (ulFlag) {
-  case 0 :
+    switch (ulFlag) {
+    case 0 :
 #ifdef __EMX__
-    // initialize the C library
-    if (_CRT_init())
-      break;
-    // initialize C++ statics
-    __ctordtorInit();
+        // initialize the C library
+        if (_CRT_init())
+          break;
+        // initialize C++ statics
+        __ctordtorInit();
 #else
 #  error "Add code to initialize C/C++ library of this compiler!"
 #endif
 
-    // check that the runtime Odin version matches the compile time version
-    // (this will issue a message box and abort the process on mismatch)
-    CheckVersionFromHMOD(PE2LX_VERSION, hModule);
+        // check that the runtime Odin version matches the compile time version
+        // (this will issue a message box and abort the process on mismatch)
+        CheckVersionFromHMOD(PE2LX_VERSION, hModule);
 
-    // enable __try/__except support
-    EnableSEH();
+        // enable __try/__except support
+        EnableSEH();
 
-    dllHandle = RegisterLxDll(hModule, DllMain, NULL);
-    if (dllHandle == 0)
-      break;
+        dllHandle = RegisterLxDll(hModule, DllMain, NULL);
+        if (dllHandle == 0)
+          break;
 
-    return 1;
+        return 1;
 
-  case 1 :
-    if (dllHandle) {
-      UnregisterLxDll(dllHandle);
-    }
+    case 1 :
+        if (dllHandle) {
+          UnregisterLxDll(dllHandle);
+        }
 #ifdef __EMX__
-    // destroy C++ statics
-    __ctordtorTerm();
-    _CRT_term();
+        // destroy C++ statics
+        __ctordtorTerm();
+        _CRT_term();
 #else
 #  error "Add code to initialize C/C++ library of this compiler!"
 #endif
+        return 0;
+
+    default:
+        break;
+    }
+
+    // failure
     return 0;
-
-  default:
-    break;
-  }
-
-  // failure
-  return 0;
 }
 
-#endif // __WIN32OS2__