win32: add uptime to sysinfo(2), enable uptime applet

Fill the uptime member of the sysinfo structure.  With this change
we can:

- use sysinfo(2) in the 'ps' applet;

- enable the 'uptime' applet (though without useful support for
  load averages).

1 files changed, 2 insertions, 3 deletions

diff --git a/win32/mingw.c b/win32/mingw.c
index 48d2eefa7..ddc64b43a 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1389,6 +1389,8 @@ int sysinfo(struct sysinfo *info)
         info->totalswap = mem.ullTotalPageFile - mem.ullTotalPhys;
         info->freeswap = mem.ullAvailPageFile - mem.ullAvailPhys;
 
+        info->uptime = GetTickCount64() / 1000;
+
         return 0;
 }
 
@@ -1617,9 +1619,7 @@ off_t mingw_lseek(int fd, off_t offset, int whence)
         return _lseeki64(fd, offset, whence);
 }
 
-#if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
 #undef GetTickCount64
-
 ULONGLONG CompatGetTickCount64(void)
 {
         DECLARE_PROC_ADDR(ULONGLONG, GetTickCount64, void);
@@ -1630,7 +1630,6 @@ ULONGLONG CompatGetTickCount64(void)
 
         return GetTickCount64();
 }
-#endif
 
 #if ENABLE_FEATURE_INSTALLER
 /*