[glibc] misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355)

[glibc] misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355)

[Adhemerval Zanella]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cac6b54ae2e99013d472ce548405886d301c73e4

commit cac6b54ae2e99013d472ce548405886d301c73e4
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Sun Apr 11 00:04:01 2021 -0300

    misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355)
    
    There is no easy solution as described on first comment in bug report,
    and some code (like busybox) assumes facilitynames existance when
    SYSLOG_NAMES is defined (so we can't just remove it as suggested in
    comment #2).
    
    So use the easier solution and guard it with __USE_MISC.

Diff:
---
 misc/sys/syslog.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h
index dc3b0e7ef8..d933fea104 100644
--- a/misc/sys/syslog.h
+++ b/misc/sys/syslog.h
@@ -62,7 +62,7 @@
 #define	LOG_PRI(p)	((p) & LOG_PRIMASK)
 #define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
 
-#ifdef SYSLOG_NAMES
+#if defined SYSLOG_NAMES && defined __USE_MISC
 #define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
 				/* mark "facility" */
 #define	INTERNAL_MARK	LOG_MAKEPRI(LOG_NFACILITIES << 3, 0)
@@ -118,7 +118,7 @@ CODE prioritynames[] =
 				/* facility of pri */
 #define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
 
-#ifdef SYSLOG_NAMES
+#if defined SYSLOG_NAMES && defined __USE_MISC
 CODE facilitynames[] =
   {
     { "auth", LOG_AUTH },