5 files changed, 8 insertions, 6 deletions

diff --git a/coreutils/test.c b/coreutils/test.c
index d1a0b6025..ba6feb033 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -156,8 +156,8 @@ struct t_op {
         {0,     0,      0}
 };
 
-char **t_wp;
-struct t_op const *t_wp_op;
+static char **t_wp;
+static struct t_op const *t_wp_op;
 static gid_t *group_array = NULL;
 static int ngroups;
 
diff --git a/more.c b/more.c
index ffc8206f2..9310cf930 100644
--- a/more.c
+++ b/more.c
@@ -51,7 +51,7 @@ FILE *cin;
 
 static struct termios initial_settings, new_settings;
 
-void gotsig(int sig)
+static void gotsig(int sig)
 {
         setTermSettings(fileno(cin), &initial_settings);
         fprintf(stdout, "\n");
diff --git a/test.c b/test.c
index d1a0b6025..ba6feb033 100644
--- a/test.c
+++ b/test.c
@@ -156,8 +156,8 @@ struct t_op {
         {0,     0,      0}
 };
 
-char **t_wp;
-struct t_op const *t_wp_op;
+static char **t_wp;
+static struct t_op const *t_wp_op;
 static gid_t *group_array = NULL;
 static int ngroups;
 
diff --git a/util-linux/more.c b/util-linux/more.c
index ffc8206f2..9310cf930 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -51,7 +51,7 @@ FILE *cin;
 
 static struct termios initial_settings, new_settings;
 
-void gotsig(int sig)
+static void gotsig(int sig)
 {
         setTermSettings(fileno(cin), &initial_settings);
         fprintf(stdout, "\n");
diff --git a/utility.c b/utility.c
index f22251895..fa2067af3 100644
--- a/utility.c
+++ b/utility.c
@@ -962,6 +962,7 @@ void my_getgrgid(char *group, long gid)
         my_getid("/etc/group", group, gid, NULL);
 }
 
+#if defined BB_ID
 /* gets a gid given a user name */
 long my_getpwnamegid(char *name)
 {
@@ -969,6 +970,7 @@ long my_getpwnamegid(char *name)
         my_getid("/etc/passwd", name, -1, &gid);
         return gid;
 }
+#endif
 
 #endif
  /* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR \