diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-10-19 19:01:06 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-10-19 19:01:06 +0000 |
| commit | f18284fc5cd141baa0c4968d387deee44ea86c7f (patch) | |
| tree | 3fbbc0a49a95679ac39e5f76ed72687a696bfb69 | |
| parent | 1dd7e7864ceb1408e31a10948995e7a373958581 (diff) | |
Remove the LOG_MAKEPRI macro. It has been broken (the << 3 is wrong) since
the dawn of time. A few systems fixed^Hchanged it, thus breaking other code.
Since the usage of it is now a mess, the right path from here on out is to
*remove* the macro forever and cope with the (very minor) fallout.
ok guenther tedu millert sthen
| -rw-r--r-- | sys/sys/syslog.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h index 5445227bec8..c3161de2194 100644 --- a/sys/sys/syslog.h +++ b/sys/sys/syslog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syslog.h,v 1.12 2006/01/06 18:53:06 millert Exp $ */ +/* $OpenBSD: syslog.h,v 1.13 2010/10/19 19:01:05 deraadt Exp $ */ /* $NetBSD: syslog.h,v 1.14 1996/04/03 20:46:44 christos Exp $ */ /* @@ -58,12 +58,11 @@ #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)) #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_NFACILITIES<<3) typedef struct _code { char *c_name; int c_val; |