am f6ce4490: am 15e71cd7: Merge "Remove deprecated and unused constants from <sys/klog.h>."

* commit 'f6ce44900e5b94c18a026ac4ce4d5fd2c51663d4':
  Remove deprecated and unused constants from <sys/klog.h>.
This commit is contained in:
Elliott Hughes 2014-03-03 20:55:35 +00:00 committed by Android Git Automerger
commit 29264f4eda

View File

@ -25,6 +25,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _SYS_KLOG_H_
#define _SYS_KLOG_H_
@ -45,13 +46,6 @@ __BEGIN_DECLS
#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
extern int klogctl(int, char *, int);
__END_DECLS