5 files changed, 17 insertions, 3 deletions

diff --git a/procps/iostat.c b/procps/iostat.c
index 1c6fb87ba..7bf567c34 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -28,7 +28,7 @@
 #if 1
 typedef unsigned long long cputime_t;
 typedef long long icputime_t;
-# define FMT_DATA "ll"
+# define FMT_DATA LL_FMT
 # define CPUTIME_MAX (~0ULL)
 #else
 typedef unsigned long cputime_t;
diff --git a/procps/kill.c b/procps/kill.c
index a30a79dd8..073e74332 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -207,6 +207,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
  do_it_now:
         pid = getpid();
 
+#if ENABLE_KILLALL5
         if (is_killall5) {
                 pid_t sid;
                 procps_status_t* p = NULL;
@@ -264,6 +265,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                         kill(-1, SIGCONT);
                 return errors;
         }
+#endif
 
 #if ENABLE_KILL || ENABLE_KILLALL
         /* Pid or name is required for kill/killall */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 4ea1b5d97..e7dc4312a 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -49,7 +49,7 @@
 #if 1
 typedef unsigned long long data_t;
 typedef long long idata_t;
-#define FMT_DATA "ll"
+#define FMT_DATA LL_FMT
 #define DATA_MAX ULLONG_MAX
 #else
 typedef unsigned long data_t;
diff --git a/procps/ps.c b/procps/ps.c
index 815c11578..a4de11379 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -35,7 +35,6 @@
 //config:       bool "Enable -o time and -o etime specifiers"
 //config:       default y
 //config:       depends on (PS || MINIPS) && DESKTOP
-//config:       select PLATFORM_LINUX
 //config:
 //config:config FEATURE_PS_UNUSUAL_SYSTEMS
 //config:       bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -126,6 +125,8 @@ static unsigned long get_uptime(void)
         if (sysinfo(&info) < 0)
                 return 0;
         return info.uptime;
+#elif ENABLE_PLATFORM_MINGW32
+        return GetTickCount64()/1000;
 #elif 1
         unsigned long uptime;
         char buf[sizeof(uptime)*3 + 2];
@@ -238,10 +239,12 @@ static void func_comm(char *buf, int size, const procps_status_t *ps)
         safe_strncpy(buf, ps->comm, size+1);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void func_state(char *buf, int size, const procps_status_t *ps)
 {
         safe_strncpy(buf, ps->state, size+1);
 }
+#endif
 
 static void func_args(char *buf, int size, const procps_status_t *ps)
 {
@@ -258,6 +261,7 @@ static void func_ppid(char *buf, int size, const procps_status_t *ps)
         sprintf(buf, "%*u", size, ps->ppid);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void func_pgid(char *buf, int size, const procps_status_t *ps)
 {
         sprintf(buf, "%*u", size, ps->pgid);
@@ -294,6 +298,7 @@ static void func_tty(char *buf, int size, const procps_status_t *ps)
         if (ps->tty_major) /* tty field of "0" means "no tty" */
                 snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor);
 }
+#endif
 
 #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
 static void func_rgroup(char *buf, int size, const procps_status_t *ps)
@@ -384,7 +389,9 @@ static const ps_out_t out_spec[] = {
         { MAX_WIDTH          , "args"  ,"COMMAND",func_args  ,PSSCAN_COMM    },
         { 5                  , "pid"   ,"PID"    ,func_pid   ,PSSCAN_PID     },
         { 5                  , "ppid"  ,"PPID"   ,func_ppid  ,PSSCAN_PPID    },
+#if !ENABLE_PLATFORM_MINGW32
         { 5                  , "pgid"  ,"PGID"   ,func_pgid  ,PSSCAN_PGID    },
+#endif
 #if ENABLE_FEATURE_PS_TIME
         { sizeof("ELAPSED")-1, "etime" ,"ELAPSED",func_etime ,PSSCAN_START_TIME },
 #endif
@@ -397,12 +404,14 @@ static const ps_out_t out_spec[] = {
 #if ENABLE_FEATURE_PS_TIME
         { 5                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
 #endif
+#if !ENABLE_PLATFORM_MINGW32
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
         { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
 /* Not mandated, but useful: */
         { 5                  , "sid"   ,"SID"    ,func_sid   ,PSSCAN_SID     },
         { 4                  , "stat"  ,"STAT"   ,func_state ,PSSCAN_STATE   },
         { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
+#endif
 #if ENABLE_SELINUX
         { 35                 , "label" ,"LABEL"  ,func_label ,PSSCAN_CONTEXT },
 #endif
@@ -541,6 +550,8 @@ static void format_process(const procps_status_t *ps)
 #if ENABLE_SELINUX
 # define SELINUX_O_PREFIX "label,"
 # define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+#elif ENABLE_PLATFORM_MINGW32
+# define DEFAULT_O_STR    ("pid,ppid,user" IF_FEATURE_PS_TIME(",time,etime") ",args")
 #else
 # define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
 #endif
diff --git a/procps/smemcap.c b/procps/smemcap.c
index 2f8ab192e..01acbf74e 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -19,6 +19,7 @@
 //kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
 
 #include "libbb.h"
+#define BB_ARCHIVE_PUBLIC
 #include "bb_archive.h"
 
 struct fileblock {