OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix LOG_MAKEPRI to agree with BSD

This commit is contained in:
Andreas Schwab 2012-07-10 19:11:03 +02:00
parent ba7fefc8e0
commit c68257729d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-07-10 Andreas Schwab <schwab@linux-m68k.org>
[BZ #14347]
* misc/sys/syslog.h (LOG_MAKEPRI): Don't shift first argument.
(INTERNAL_MARK): Shift it here.
2012-07-10 Marek Polacek <polacek@redhat.com>
[BZ #14151]

2
NEWS
View File

@ -9,7 +9,7 @@ Version 2.17
* The following bugs are resolved with this release:
6778, 14042, 14151, 14154, 14157, 14283, 14328, 14331, 14337
6778, 14042, 14151, 14154, 14157, 14283, 14328, 14331, 14337, 14347
Version 2.16

4
misc/sys/syslog.h
View File

@ -60,12 +60,12 @@
#define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */
/* extract priority */
#define LOG_PRI(p) ((p) & LOG_PRIMASK)
#define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))
#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
#ifdef SYSLOG_NAMES
#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
/* mark "facility" */
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0)
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES << 3, 0)
typedef struct _code {
char *c_name;
int c_val;