aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonard Grey <lgrey@chromium.org>2023-05-01 17:13:08 -0400
committerLeonard Grey <lgrey@chromium.org>2023-05-01 22:51:23 +0000
commit99cd657eec78e330a1f0d4184dd6d0e163209c70 (patch)
tree7e75d8d22bad228bf1619452cd7a6df6bd35257c
parentde040fa25de948e71cef9c035ba152fa75bfe0ec (diff)
downloadgoogle-breakpad-99cd657eec78e330a1f0d4184dd6d0e163209c70.tar.gz
Reimport architecture/byte_order.h from canonical repo
Bug: b/257505171 Change-Id: I210b6689683ff2cf561997584924fd9b568943cb Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/4494631 Reviewed-by: Mark Mentovai <mark@chromium.org>
-rw-r--r--src/third_party/mac_headers/README4
-rw-r--r--src/third_party/mac_headers/architecture/byte_order.h29
2 files changed, 17 insertions, 16 deletions
diff --git a/src/third_party/mac_headers/README b/src/third_party/mac_headers/README
index 3dccc49d..2b855b60 100644
--- a/src/third_party/mac_headers/README
+++ b/src/third_party/mac_headers/README
@@ -3,7 +3,6 @@ processes Mach-O files on Linux.
From xnu-8792.41.9 (https://github.com/apple-oss-distributions/xnu at 5c2921b)
i386/_types.h
-architecture/byte_order.h
arm/_types.h
mach/boolean.h
mach/machine.h
@@ -21,3 +20,6 @@ mach-o/arch.h
mach-o/fat.h
mach-o/loader.h
mach-o/nlist.h
+
+From architecture-282 (https://github.com/apple-oss-distributions/architecture at fe86900)
+architecture/byte_order.h
diff --git a/src/third_party/mac_headers/architecture/byte_order.h b/src/third_party/mac_headers/architecture/byte_order.h
index 8fb7f7e9..1f723ae1 100644
--- a/src/third_party/mac_headers/architecture/byte_order.h
+++ b/src/third_party/mac_headers/architecture/byte_order.h
@@ -1,24 +1,23 @@
/*
- * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2008 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
- *
- * "Portions Copyright (c) 1999 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 1.0 (the 'License'). You may not use this file
- * except in compliance with the License. Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
- *
+ *
+ * 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. 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,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License."
- *
+ * 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_LICENSE_HEADER_END@
*/
/*
@@ -30,7 +29,7 @@
#ifndef _ARCHITECTURE_BYTE_ORDER_H_
#define _ARCHITECTURE_BYTE_ORDER_H_
-
+
enum NXByteOrder {
NX_UnknownByteOrder,
NX_LittleEndian,