Revert "[runtime] Fix a win32 build failure, more remains."

This reverts commit 5c90d7cdba4c82f2f4e2ae7a2af3c00ebb9029c5.

Revert this as it breaks the build.

diff --git a/mono/metadata/process.c b/mono/metadata/process.c
index d861b60811fe8917257f3ce5a201ce8ab0e5b328..658c43375e1c635b15f9f4bd61640b052047b780 100755 (executable)
--- a/mono/metadata/process.c
+++ b/mono/metadata/process.c
@@ -539,7 +539,7 @@ typedef DWORD (WINAPI *RTLNTSTATUSTODOSERROR_PROC) (NTSTATUS);
 
 static DWORD WINAPI GetProcessId_detect (HANDLE process);
 
-static GETPROCESSID_PROC GetProcessIdFunc = &GetProcessId_detect;
+static GETPROCESSID_PROC GetProcessId = &GetProcessId_detect;
 static NTQUERYINFORMATIONPROCESS_PROC NtQueryInformationProcess_proc = NULL;
 static RTLNTSTATUSTODOSERROR_PROC RtlNtStatusToDosError_proc = NULL;
 
@@ -573,8 +573,8 @@ static DWORD WINAPI GetProcessId_detect (HANDLE process)
        if (module_handle != NULL) {
                GetProcessId_kernel = (GETPROCESSID_PROC) GetProcAddress (module_handle, "GetProcessId");
                if (GetProcessId_kernel != NULL) {
-                       GetProcessIdFunc = GetProcessId_kernel;
-                       return GetProcessIdFunc (process);
+                       GetProcessId = GetProcessId_kernel;
+                       return GetProcessId (process);
                }
        }
 
@@ -585,15 +585,15 @@ static DWORD WINAPI GetProcessId_detect (HANDLE process)
                if (NtQueryInformationProcess_proc != NULL) {
                        RtlNtStatusToDosError_proc = (RTLNTSTATUSTODOSERROR_PROC) GetProcAddress (module_handle, "RtlNtStatusToDosError");
                        if (RtlNtStatusToDosError_proc != NULL) {
-                               GetProcessIdFunc = &GetProcessId_ntdll;
-                               return GetProcessIdFunc (process);
+                               GetProcessId = &GetProcessId_ntdll;
+                               return GetProcessId (process);
                        }
                }
        }
 
        /* Fall back to ERROR_CALL_NOT_IMPLEMENTED */
-       GetProcessIdFunc = &GetProcessId_stub;
-       return GetProcessIdFunc (process);
+       GetProcessId = &GetProcessId_stub;
+       return GetProcessId (process);
 }
 #endif /* HOST_WIN32 */
 #endif /* !HAVE_GETPROCESSID */