summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-09-14 15:42:30 -0700
committerAndrew Dodd <atd7@cornell.edu>2012-10-07 16:07:03 -0400
commit079b2a514a003070e8b58ae9b4244516df6ed22d (patch)
tree33f788f6494b3bb9c9ecd36a0e5cff4af29c5b0d /libc
parent17e6c693bfa305f06868edf2ecbb6b5dfaf5ebd5 (diff)
downloadbionic-079b2a514a003070e8b58ae9b4244516df6ed22d.zip
bionic-079b2a514a003070e8b58ae9b4244516df6ed22d.tar.gz
bionic-079b2a514a003070e8b58ae9b4244516df6ed22d.tar.bz2
Fix <sys/klog.h> to correspond to the kernel operations.
This makes the constants correspond to those in the Linux kernel's include/linux/syslog.h, but keeping our old badly-named constants for source compatibility. Change-Id: Ia47d1299205754cbfffd29ed48b497b53d1edaae
Diffstat (limited to 'libc')
-rw-r--r--libc/include/sys/klog.h28
1 files changed, 18 insertions, 10 deletions
diff --git a/libc/include/sys/klog.h b/libc/include/sys/klog.h
index 21bb7d9..02851d2 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);