diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-07-10 19:11:03 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-07-10 22:39:30 +0200 |
| commit | c68257729de8a2165e161b187cf866897f71c502 (patch) | |
| tree | 95683ce6453495474f494bbadafec306e643aac3 | |
| parent | ba7fefc8e00d027e0298d180aecce0689f660329 (diff) | |
| download | glibc-c68257729de8a2165e161b187cf866897f71c502.tar.gz glibc-c68257729de8a2165e161b187cf866897f71c502.tar.xz glibc-c68257729de8a2165e161b187cf866897f71c502.zip | |
Fix LOG_MAKEPRI to agree with BSD
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | misc/sys/syslog.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 019b30d243..079797e8f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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] diff --git a/NEWS b/NEWS index bd5b3786c6..d66da32ff8 100644 --- a/NEWS +++ b/NEWS @@ -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 diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index 77123ab503..41331a8fd1 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -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; |