diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-14 16:21:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-14 16:21:18 -0700 |
| commit | 4b3ff1f0fa141b95bacf52960be588c343d8e5d6 (patch) | |
| tree | 05909ddcba8534efdc0845c68b71aa9e7e5342a4 | |
| parent | b67d4ec5babf7d26bc0e52b942779012d14e14c8 (diff) | |
| parent | f8902bf7079be1a7ad51b82ebb24556ff40a1fff (diff) | |
| download | bionic-4b3ff1f0fa141b95bacf52960be588c343d8e5d6.tar.gz | |
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.
| -rw-r--r-- | libc/include/sys/klog.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/libc/include/sys/klog.h b/libc/include/sys/klog.h index 21bb7d9d9..02851d290 100644 --- a/libc/include/sys/klog.h +++ b/libc/include/sys/klog.h @@ -32,17 +32,25 @@ __BEGIN_DECLS -#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_DISABLE 6 -#define KLOG_ENABLE 7 -#define KLOG_SETLEVEL 8 +/* 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 #define KLOG_UNREADSIZE 9 -#define KLOG_WRITE 10 +#define KLOG_WRITE 10 extern int klogctl(int, char *, int); |