From 3ea280b8326e1d9d8c7b9b1fbcb19af2c674e309 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 27 Nov 2018 10:14:01 +0000 Subject: ps: bring code marginally more into line with upstream --- procps/ps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/procps/ps.c b/procps/ps.c index de062fe8b..4e6dc1ef9 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -125,7 +125,9 @@ static unsigned long get_uptime(void) if (sysinfo(&info) < 0) return 0; return info.uptime; -#elif !ENABLE_PLATFORM_MINGW32 +#elif ENABLE_PLATFORM_MINGW32 + return GetTickCount64()/1000; +#elif 1 unsigned long uptime; char buf[sizeof(uptime)*3 + 2]; /* /proc/uptime is "UPTIME_SEC.NN IDLE_SEC.NN\n" @@ -136,8 +138,6 @@ static unsigned long get_uptime(void) buf[sizeof(buf)-1] = '\0'; sscanf(buf, "%lu", &uptime); return uptime; -#elif ENABLE_PLATFORM_MINGW32 - return GetTickCount64()/1000; #else struct timespec ts; if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) -- cgit v1.2.3-55-g6feb