Changeset 64

Timestamp:

Jul 16, 2010, 8:13:29 PM (15 years ago)

Author:

dmik

Message:

hotspot/src: More to r63.

File:

• trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp (modified) (9 diffs)

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

@@ -98 +98 @@
 static int getLastErrorString(char *buf, size_t len);
 
+#ifdef __WIN32OS2__
+extern "C"
+#endif
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) {
   switch (reason) {
@@ -554 +557 @@
                            CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION,
                            (PDWORD)&thread_id);
-#endif  
+#endif
   if (thread_handle == NULL) {
     // perhaps STACK_SIZE_PARAM_IS_A_RESERVATION is not supported, try again
@@ -574 +577 @@
                            CREATE_SUSPENDED,
                            &thread_id);
-#endif  
+#endif
   }
   if (thread_handle == NULL) {
@@ -655 +658 @@
 
   return ms.dwAvailPhys;
-#else    
+#else
   // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
   // value if total memory is larger than 4GB
@@ -1570 +1573 @@
     case 5000: st->print(" Windows 2000"); break;
     case 5001: st->print(" Windows XP"); break;
-#ifndef __WIN32OS2__      
+#ifndef __WIN32OS2__
     case 5002:
     case 6000:
@@ -1640 +1643 @@
   ms.dwLength = sizeof(ms);
   GlobalMemoryStatus(&ms);
-#else    
+#else
   // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
   // value if total memory is larger than 4GB
@@ -1654 +1657 @@
   st->print(", swap %uk", ms.dwTotalPageFile >> 10);
   st->print("(%uk free)", ms.dwAvailPageFile >> 10);
-#else    
+#else
   st->print(", swap %uk", ms.ullTotalPageFile >> 10);
   st->print("(%uk free)", ms.ullAvailPageFile >> 10);
@@ -3238 +3241 @@
   GlobalMemoryStatus(&ms);
   _physical_memory = ms.dwTotalPhys;
-#else    
+#else
   MEMORYSTATUSEX ms;
   ms.dwLength = sizeof(ms);
@@ -3439 +3442 @@
 #else
     __asm { fstcw fp_control_word }
-#endif    
+#endif
     // see Intel PPro Manual, Vol. 2, p 7-16
     const long precision = 0x20;