--- xnu/xnu-12377.101.15/libsyscall/mach/error_codes.c
+++ xnu/xnu-1228/libsyscall/mach/error_codes.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2003-2019 Apple Inc. All rights reserved.
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ * 
  * 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
@@ -11,10 +11,10 @@
  * 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.
- *
+ * 
  * 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,34 +22,34 @@
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/*
+/* 
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- *
+ * 
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS 
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ * 
  * Carnegie Mellon requests users of this software to return to
- *
+ * 
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- *
+ * 
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
@@ -62,60 +62,49 @@
  *      Generic error code interface
  */
 
-#include <TargetConditionals.h>
 #include <mach/error.h>
 #include "errorlib.h"
-#if !TARGET_OS_DRIVERKIT
-#include "err_libkern.sub"
 #include "err_iokit.sub"
-#endif // !TARGET_OS_DRIVERKIT
 #include "err_ipc.sub"
 #include "err_kern.sub"
 #include "err_mach_ipc.sub"
 #include "err_server.sub"
 #include "err_us.sub"
-#include "err_vm.sub"
 
-const struct error_system _mach_errors[err_max_system + 1] = {
+__private_extern__ struct error_system _mach_errors[err_max_system+1] = {
 	/* 0; err_kern */
 	{
-		.max_sub = errlib_count(err_os_sub),
-		.bad_sub = "(operating system/?) unknown subsystem error",
-		.subsystem = err_os_sub,
+		errlib_count(err_os_sub),
+		"(operating system/?) unknown subsystem error",
+		err_os_sub,
 	},
 	/* 1; err_us */
 	{
-		.max_sub = errlib_count(err_us_sub),
-		.bad_sub = "(user space/?) unknown subsystem error",
-		.subsystem = err_us_sub,
+		errlib_count(err_us_sub),
+		"(user space/?) unknown subsystem error",
+		err_us_sub,
 	},
 	/* 2; err_server */
 	{
-		.max_sub = errlib_count(err_server_sub),
-		.bad_sub = "(server/?) unknown subsystem error",
-		.subsystem = err_server_sub,
+		errlib_count(err_server_sub),
+		"(server/?) unknown subsystem error",
+		err_server_sub,
 	},
 	/* 3 (& 3f); err_ipc */
 	{
-		.max_sub = errlib_count(err_ipc_sub),
-		.bad_sub = "(ipc/?) unknown subsystem error",
-		.subsystem = err_ipc_sub,
+		errlib_count(err_ipc_sub),
+		"(ipc/?) unknown subsystem error",
+		err_ipc_sub,
 	},
 	/* 4; err_mach_ipc */
 	{
-		.max_sub = errlib_count(err_mach_ipc_sub),
-		.bad_sub = "(ipc/?) unknown subsystem error",
-		.subsystem = err_mach_ipc_sub,
+		errlib_count(err_mach_ipc_sub),
+		"(ipc/?) unknown subsystem error",
+		err_mach_ipc_sub,
 	},
 
 	/* 0x05 */ errorlib_system_null,
-	/* 0x06 */ errorlib_system_null,
-	/* 0x07; err_vm */
-	{
-		.max_sub = errlib_count(err_vm_sub),
-		.bad_sub = "(vm/?) unknown subsystem error",
-		.subsystem = err_vm_sub,
-	},
+	/* 0x06 */ errorlib_system_null, /* 0x07 */ errorlib_system_null,
 	/* 0x08 */ errorlib_system_null, /* 0x09 */ errorlib_system_null,
 	/* 0x0a */ errorlib_system_null, /* 0x0b */ errorlib_system_null,
 	/* 0x0c */ errorlib_system_null, /* 0x0d */ errorlib_system_null,
@@ -142,29 +131,18 @@
 	/* 0x30 */ errorlib_system_null, /* 0x31 */ errorlib_system_null,
 	/* 0x32 */ errorlib_system_null, /* 0x33 */ errorlib_system_null,
 	/* 0x34 */ errorlib_system_null, /* 0x35 */ errorlib_system_null,
-	/* 0x36 */ errorlib_system_null,
-
-#if !TARGET_OS_DRIVERKIT
-	/* 0x37; err_libkern */
-	{
-		.max_sub = errlib_count(err_libkern_sub),
-		.bad_sub = "(libkern/?) unknown subsystem error",
-		.subsystem = err_libkern_sub,
-	},
+	/* 0x36 */ errorlib_system_null, /* 0x37 */ errorlib_system_null,
 
 	/* 0x38; err_iokit */
 	{
-		.max_sub = errlib_count(err_iokit_sub),
-		.bad_sub = "(iokit/?) unknown subsystem error",
-		.subsystem = err_iokit_sub,
-		.map_table = err_iokit_sub_map,
-		.map_count = errlib_count(err_iokit_sub_map)
+		errlib_count(err_iokit_sub),
+		"(iokit/?) unknown subsystem error",
+		err_iokit_sub,
+		err_iokit_sub_map,
+		errlib_count(err_iokit_sub_map)
 	},
-#else
-	/* 0x37 */ errorlib_system_null, /* 0x38 */ errorlib_system_null,
-#endif // TARGET_OS_DRIVERKIT
 
-	/* 0x39 */ errorlib_system_null,
+	                                 /* 0x39 */ errorlib_system_null,
 	/* 0x3a */ errorlib_system_null, /* 0x3b */ errorlib_system_null,
 	/* 0x3c */ errorlib_system_null, /* 0x3d */ errorlib_system_null,
 	/* 0x3e */ errorlib_system_null, /* 0x3f */ errorlib_system_null,