Commit 54126b1d41ed60569fc3ee55af8bb1f6f6e59450
2019-02-25T18:28:40
- don't use GetProcessTimes and FILETIME for now Signed-off-by: SSE4 <tomskside@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/sys/wait.h b/sys/wait.h
index f216143..d7b17c5 100644
--- a/sys/wait.h
+++ b/sys/wait.h
@@ -111,21 +111,29 @@ typedef void * HANDLE;
#define WAIT_TIMEOUT 258L
#endif /* WAIT_TIMEOUT */
-typedef struct private_FILETIME {
+/*
+FIXME: causes FILETIME to conflict
+#ifndef _FILETIME_
+#define _FILETIME_
+
+typedef struct FILETIME {
DWORD dwLowDateTime;
DWORD dwHighDateTime;
-} private_FILETIME, *private_PFILETIME, *private_LPFILETIME;
+} FILETIME, *PFILETIME, *LPFILETIME;
-#define FILETIME private_FILETIME
-#define PFILETIME private_PFILETIME
-#define LPFILETIME private_LPFILETIME
+#endif
+*/
WINBASEAPI DWORD WINAPI GetCurrentProcessId(VOID);
WINBASEAPI BOOL WINAPI CloseHandle(HANDLE hObject);
WINBASEAPI HANDLE WINAPI OpenProcess(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwProcessId);
WINBASEAPI DWORD WINAPI WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds);
WINBASEAPI BOOL WINAPI GetExitCodeProcess(HANDLE hProcess, LPDWORD lpExitCode);
+
+/*
+FIXME: causes FILETIME to conflict
WINBASEAPI BOOL WINAPI GetProcessTimes(HANDLE hProcess, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime);
+*/
#endif /* _INC_WINDOWS */
@@ -323,6 +331,8 @@ static int __filter_pid(PROCESSENTRY32W * pe, DWORD pid)
return pe->th32ProcessID == pid;
}
+/*
+FIXME: causes FILETIME to conflict
static void __filetime2timeval(FILETIME time, struct timeval * out)
{
unsigned long long value = time.dwHighDateTime;
@@ -330,6 +340,7 @@ static void __filetime2timeval(FILETIME time, struct timeval * out)
out->tv_sec = (long)(value / 1000000);
out->tv_usec = (long)(value % 1000000);
}
+*/
static int __waitpid_internal(pid_t pid, int * status, int options, siginfo_t * infop, struct rusage * rusage)
{
@@ -423,12 +434,15 @@ static int __waitpid_internal(pid_t pid, int * status, int options, siginfo_t *
if (rusage)
{
memset(rusage, 0, sizeof(*rusage));
+ /*
+ FIXME: causes FILETIME to conflict
FILETIME creation_time, exit_time, kernel_time, user_time;
if (GetProcessTimes(hProcess, &creation_time, &exit_time, &kernel_time, &user_time))
{
__filetime2timeval(kernel_time, &rusage->ru_stime);
__filetime2timeval(user_time, &rusage->ru_utime);
}
+ */
}
if (infop)
{