Merge "syslog.h: missing LOG_MAKEPRI definition"