am f8902bf7: am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."

* commit 'f8902bf7079be1a7ad51b82ebb24556ff40a1fff':
  Fix <sys/klog.h> to correspond to the kernel operations.
This commit is contained in:
Elliott Hughes 2012-09-14 16:21:18 -07:00 committed by Android Git Automerger
commit 4b3ff1f0fa

View file

@ -32,12 +32,20 @@
__BEGIN_DECLS
/* These correspond to the kernel's SYSLOG_ACTION_whatever constants. */
#define KLOG_CLOSE 0
#define KLOG_OPEN 1
#define KLOG_READ 2
#define KLOG_READ_ALL 3
#define KLOG_READ_CLEAR 4
#define KLOG_CLEAR 5
#define KLOG_CONSOLE_OFF 6
#define KLOG_CONSOLE_ON 7
#define KLOG_CONSOLE_LEVEL 8
#define KLOG_SIZE_UNREAD 9
#define KLOG_SIZE_BUFFER 10
/* These are deprecated names that were used in earlier bionic releases. Do not use. */
#define KLOG_DISABLE 6
#define KLOG_ENABLE 7
#define KLOG_SETLEVEL 8