am ee7b80d7: am f6f96df5: Merge "syslog.h: missing LOG_MAKEPRI definition"

* commit 'ee7b80d7cf09c32ea806dfbaa401ba5790670064':
  syslog.h: missing LOG_MAKEPRI definition
This commit is contained in:
Mark Salyzyn 2015-03-13 07:20:41 +00:00 committed by Android Git Automerger
commit 8e2d61963d

View File

@ -47,6 +47,7 @@ __BEGIN_DECLS
#define LOG_PRIMASK 7
#define LOG_PRI(x) ((x) & LOG_PRIMASK)
#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
/* Facilities are currently ignored on Android. */
#define LOG_KERN 0000