| 1 | diff -u -r ../util-linux-2.28/sys-utils/dmesg.c ./sys-utils/dmesg.c |
| 2 | --- ../util-linux-2.28/sys-utils/dmesg.c 2016-03-16 05:39:39.246181199 -0400 |
| 3 | +++ ./sys-utils/dmesg.c 2016-06-23 06:15:22.841546295 -0400 |
| 4 | @@ -11,7 +11,7 @@ |
| 5 | #include <getopt.h> |
| 6 | #include <stdlib.h> |
| 7 | #include <sys/klog.h> |
| 8 | -#include <sys/syslog.h> |
| 9 | +#include <syslog.h> |
| 10 | #include <sys/time.h> |
| 11 | #include <sys/sysinfo.h> |
| 12 | #include <ctype.h> |
| 13 | @@ -894,6 +894,9 @@ |
| 14 | * backward compatibility with syslog(2) buffers only |
| 15 | */ |
| 16 | if (ctl->raw) { |
| 17 | +#ifdef __ANDROID__ |
| 18 | +#define LOG_MAKEPRI(fac, pri) ((fac) | (pri)) |
| 19 | +#endif |
| 20 | ctl->indent = printf("<%d>[%5ld.%06ld] ", |
| 21 | LOG_MAKEPRI(rec->facility, rec->level), |
| 22 | (long) rec->tv.tv_sec, |