Changeset 140

Timestamp:

Sep 4, 2010, 1:10:40 AM (15 years ago)

Author:

dmik

Message:

jdk. sun.tools.attach: Partly adopted to OS/2.

File:

• trunk/openjdk/jdk/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c (modified) (6 diffs)

trunk/openjdk/jdk/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c

@@ -51 +51 @@
     (const char* cmd, const char* arg1, const char* arg2, const char* arg3, const char* pipename);
 
+#ifndef __WIN32OS2__
 /* OpenProcess with SE_DEBUG_NAME privilege */
 static HANDLE
 doPrivilegedOpenProcess(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwProcessId);
+#endif /* __WIN32OS2__ */
 
 /* convert jstring to C string */
@@ -91 +93 @@
  * Code copied to target process
  */
+#ifdef _MSC_VER
 #pragma check_stack (off)
+#endif
 static DWORD WINAPI thread_func(DataBlock *pData)
 {
@@ -121 +125 @@
 static void thread_end (void) {
 }
+#ifdef _MSC_VER
 #pragma check_stack
+#endif
 
 
@@ -181 +187 @@
      */
     hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, (DWORD)pid);
+#ifndef __WIN32OS2__
     if (hProcess == NULL && GetLastError() == ERROR_ACCESS_DENIED) {
         hProcess = doPrivilegedOpenProcess(PROCESS_ALL_ACCESS, FALSE, (DWORD)pid);
     }
+#endif /* __WIN32OS2__ */
 
     if (hProcess == NULL) {
@@ -459 +467 @@
 }
 
+#ifndef __WIN32OS2__
+
 /*
  * Attempts to enable the SE_DEBUG_NAME privilege and open the given process.
@@ -557 +567 @@
 }
 
+#endif /* __WIN32OS2__ */
+
 /* convert jstring to C string */
 static void jstring_to_cstring(JNIEnv* env, jstring jstr, char* cstr, int len) {