Merge branch 'busybox' into merge

2 files changed, 2 insertions, 1 deletions

diff --git a/runit/chpst.c b/runit/chpst.c
index 3ecb85cba..c2641ce8a 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -135,7 +135,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //usage:     "\n                        a SIGXCPU after N seconds"
 
 #include "libbb.h"
-#include <sys/resource.h> /* getrlimit */
 
 /*
 Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
diff --git a/runit/sv.c b/runit/sv.c
index 86d181872..8054daedf 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -222,6 +222,7 @@ struct globals {
 #define str_equal(s,t) (strcmp((s), (t)) == 0)
 
 
+#if ENABLE_SV || ENABLE_SVC
 static void fatal_cannot(const char *m1) NORETURN;
 static void fatal_cannot(const char *m1)
 {
@@ -688,6 +689,7 @@ static int sv(char **argv)
         }
         return rc > 99 ? 99 : rc;
 }
+#endif
 
 #if ENABLE_SV
 int sv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;