4 files changed, 19 insertions, 2 deletions

diff --git a/procps/iostat.c b/procps/iostat.c
index 608d41364..6a39c324f 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -29,7 +29,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/mpstat.c b/procps/mpstat.c
index 1eabd8e38..05a3f3ff3 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 eb1946d27..3e83a3e03 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -286,6 +286,7 @@ static unsigned get_kernel_HZ(void)
 
 /* Print value to buf, max size+1 chars (including trailing '\0') */
 
+#if !ENABLE_PLATFORM_MINGW32
 static void func_user(char *buf, int size, const procps_status_t *ps)
 {
 #if 1
@@ -309,12 +310,14 @@ static void func_group(char *buf, int size, const procps_status_t *ps)
 {
         safe_strncpy(buf, get_cached_groupname(ps->gid), size+1);
 }
+#endif
 
 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);
@@ -324,12 +327,14 @@ static void func_args(char *buf, int size, const procps_status_t *ps)
 {
         read_cmdline(buf, size+1, ps->pid, ps->comm);
 }
+#endif
 
 static void func_pid(char *buf, int size, const procps_status_t *ps)
 {
         sprintf(buf, "%*u", size, ps->pid);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void func_ppid(char *buf, int size, const procps_status_t *ps)
 {
         sprintf(buf, "%*u", size, ps->ppid);
@@ -371,6 +376,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
 
@@ -436,13 +442,19 @@ static void func_pcpu(char *buf, int size, const procps_status_t *ps)
 
 static const ps_out_t out_spec[] = {
 /* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */
+#if !ENABLE_PLATFORM_MINGW32
         { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
         { 8                  , "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
+#endif
         { 16                 , "comm"  ,"COMMAND",func_comm  ,PSSCAN_COMM    },
+#if !ENABLE_PLATFORM_MINGW32
         { MAX_WIDTH          , "args"  ,"COMMAND",func_args  ,PSSCAN_COMM    },
+#endif
         { 5                  , "pid"   ,"PID"    ,func_pid   ,PSSCAN_PID     },
+#if !ENABLE_PLATFORM_MINGW32
         { 5                  , "ppid"  ,"PPID"   ,func_ppid  ,PSSCAN_PPID    },
         { 5                  , "pgid"  ,"PGID"   ,func_pgid  ,PSSCAN_PGID    },
+#endif
 #if ENABLE_FEATURE_PS_TIME
         { sizeof("ELAPSED")-1, "etime" ,"ELAPSED",func_etime ,PSSCAN_START_TIME },
 #endif
@@ -455,12 +467,14 @@ static const ps_out_t out_spec[] = {
 #if ENABLE_FEATURE_PS_TIME
         { 6                  , "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
@@ -599,6 +613,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,comm")
 #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 c15fef1c3..17aeccd53 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -20,6 +20,7 @@
 //config:       a memory usage statistic tool.
 
 #include "libbb.h"
+#define BB_ARCHIVE_PUBLIC
 #include "bb_archive.h"
 
 struct fileblock {