--- xnu/xnu-12377.121.6/bsd/sys/msgbuf.h
+++ xnu/xnu-517/bsd/sys/msgbuf.h
@@ -1,20 +1,17 @@
 /*
- * Copyright (c) 2000-2010 Apple, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,8 +19,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * 
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -60,29 +57,19 @@
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
  */
-#ifndef _SYS_MSGBUF_H_
+#ifndef	_SYS_MSGBUF_H_
 #define _SYS_MSGBUF_H_
 
-#include <sys/cdefs.h>
-
-#define MAX_MSG_BSIZE   (1*1024*1024)
-struct  msgbuf {
-#define MSG_MAGIC       0x063061
-	int             msg_magic;
-	int             msg_size;
-	int             msg_bufx;               /* write pointer */
-	int             msg_bufr;               /* read pointer */
-	char    *msg_bufc;              /* buffer */
+#define	MSG_BSIZE	(4096 - 3 * sizeof(long))
+struct	msgbuf {
+#define	MSG_MAGIC	0x063061
+	long	msg_magic;
+	long	msg_bufx;		/* write pointer */
+	long	msg_bufr;		/* read pointer */
+	char	msg_bufc[MSG_BSIZE];	/* buffer */
 };
-
-#ifdef XNU_KERNEL_PRIVATE
-__BEGIN_DECLS
-extern struct   msgbuf *msgbufp;
-extern struct   msgbuf *aslbufp;
+#ifdef KERNEL
+extern struct	msgbuf *msgbufp;
 extern void log_putc(char);
-extern void log_putc_locked(struct msgbuf *, char);
-extern int log_dmesg(user_addr_t, uint32_t, int32_t *);
-__END_DECLS
-#endif /* XNU_KERNEL_PRIVATE */
-
-#endif  /* !_SYS_MSGBUF_H_ */
+#endif
+#endif	/* !_SYS_MSGBUF_H_ */