Merge branch 'busybox' into merge

1 files changed, 3 insertions, 3 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 4a59ee7d8..f8e54de54 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1536,6 +1536,7 @@ extern void run_shell(const char *shell, int loginshell, const char **args) NORE
  */
 const char *get_shell_name(void) FAST_FUNC;
 
+#if ENABLE_FEATURE_SETPRIV_CAPABILITIES || ENABLE_RUN_INIT
 unsigned cap_name_to_number(const char *cap) FAST_FUNC;
 void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC;
 void drop_capability(int cap_ordinal) FAST_FUNC;
@@ -1547,9 +1548,7 @@ struct caps { \
         struct __user_cap_data_struct data[2]; \
 }
 void getcaps(void *caps) FAST_FUNC;
-
-unsigned cap_name_to_number(const char *name) FAST_FUNC;
-void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC;
+#endif
 
 #if ENABLE_SELINUX
 extern void renew_current_security_context(void) FAST_FUNC;
@@ -2006,6 +2005,7 @@ typedef struct bb_progress_t {
         unsigned last_update_sec;
         unsigned last_change_sec;
         unsigned start_sec;
+        /*unsigned last_eta;*/
         const char *curfile;
 } bb_progress_t;