Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge

Conflicts:
	include/platform.h
	libbb/Kbuild.src
	libbb/messages.c

1 files changed, 2 insertions, 2 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index b1c772cf3..4e32414b4 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -574,12 +574,12 @@ static void check_suid(int applet_no)
 #   endif
  check_need_suid:
 #  endif
-        if (APPLET_SUID(applet_no) == _BB_SUID_REQUIRE) {
+        if (APPLET_SUID(applet_no) == BB_SUID_REQUIRE) {
                 /* Real uid is not 0. If euid isn't 0 too, suid bit
                  * is most probably not set on our executable */
                 if (geteuid())
                         bb_error_msg_and_die("must be suid to work properly");
-        } else if (APPLET_SUID(applet_no) == _BB_SUID_DROP) {
+        } else if (APPLET_SUID(applet_no) == BB_SUID_DROP) {
                 xsetgid(rgid);  /* drop all privileges */
                 xsetuid(ruid);
         }