Skip to content

Commit 74900e9

Browse files
authored
Merge pull request #25813 from linusg/bump-macos-libc
libc: Update macOS headers to SDK 26.1
2 parents 459f3b7 + f55eb18 commit 74900e9

28 files changed

+1899
-195
lines changed

lib/libc/darwin/SDKSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"MinimalDisplayName":"26.0"}
1+
{"MinimalDisplayName":"26.1"}

lib/libc/darwin/libSystem.tbd

Lines changed: 82 additions & 79 deletions
Large diffs are not rendered by default.

lib/libc/include/any-macos-any/AvailabilityInternal.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
#if __has_builtin(__is_target_os)
3838
#if __is_target_os(macos)
3939
#define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
40-
#define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_26_0
40+
#define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_26_1
4141
#endif
4242
#elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
4343
#define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
44-
#define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_26_0
44+
#define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_26_1
4545
#endif /* __has_builtin(__is_target_os) */
4646
#endif /* defined(__has_builtin) */
4747
#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED */
@@ -51,11 +51,11 @@
5151
#if __has_builtin(__is_target_os)
5252
#if __is_target_os(ios)
5353
#define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
54-
#define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_26_0
54+
#define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_26_1
5555
#endif
5656
#elif __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
5757
#define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
58-
#define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_26_0
58+
#define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_26_1
5959
#endif /* __has_builtin(__is_target_os) */
6060
#endif /* defined(__has_builtin) */
6161
#endif /* __IPHONE_OS_VERSION_MIN_REQUIRED */
@@ -65,13 +65,13 @@
6565
#if __has_builtin(__is_target_os)
6666
#if __is_target_os(watchos)
6767
#define __WATCH_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
68-
#define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_26_0
68+
#define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_26_1
6969
/* for compatibility with existing code. New code should use platform specific checks */
7070
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
7171
#endif
7272
#elif __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__
7373
#define __WATCH_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__
74-
#define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_26_0
74+
#define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_26_1
7575
/* for compatibility with existing code. New code should use platform specific checks */
7676
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
7777
#endif /* __has_builtin(__is_target_os) */
@@ -83,13 +83,13 @@
8383
#if __has_builtin(__is_target_os)
8484
#if __is_target_os(tvos)
8585
#define __TV_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
86-
#define __TV_OS_VERSION_MAX_ALLOWED __TVOS_26_0
86+
#define __TV_OS_VERSION_MAX_ALLOWED __TVOS_26_1
8787
/* for compatibility with existing code. New code should use platform specific checks */
8888
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
8989
#endif
9090
#elif __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__
9191
#define __TV_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__
92-
#define __TV_OS_VERSION_MAX_ALLOWED __TVOS_26_0
92+
#define __TV_OS_VERSION_MAX_ALLOWED __TVOS_26_1
9393
/* for compatibility with existing code. New code should use platform specific checks */
9494
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
9595
#endif /* __has_builtin(__is_target_os) */
@@ -103,7 +103,7 @@
103103
#if __has_builtin(__is_target_os)
104104
#if __is_target_os(driverkit)
105105
#define __DRIVERKIT_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
106-
#define __DRIVERKIT_VERSION_MAX_ALLOWED __DRIVERKIT_25_0
106+
#define __DRIVERKIT_VERSION_MAX_ALLOWED __DRIVERKIT_25_1
107107
#endif
108108
#endif /* __has_builtin(__is_target_os) */
109109
#endif /* defined(__has_builtin) */
@@ -114,7 +114,7 @@
114114
#if __has_builtin(__is_target_os)
115115
#if __is_target_os(visionos)
116116
#define __VISION_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
117-
#define __VISION_OS_VERSION_MAX_ALLOWED __VISIONOS_26_0
117+
#define __VISION_OS_VERSION_MAX_ALLOWED __VISIONOS_26_1
118118
/* for compatibility with existing code. New code should use platform specific checks */
119119
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_17_1
120120
#endif

lib/libc/include/any-macos-any/AvailabilityVersions.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
#define __MAC_15_6 150600
9898
#define __MAC_16_0 160000
9999
#define __MAC_26_0 260000
100+
#define __MAC_26_1 260100
100101
/* __MAC__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
101102

102103
#define __IPHONE_2_0 20000
@@ -188,6 +189,7 @@
188189
#define __IPHONE_18_6 180600
189190
#define __IPHONE_19_0 190000
190191
#define __IPHONE_26_0 260000
192+
#define __IPHONE_26_1 260100
191193
/* __IPHONE__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
192194

193195
#define __WATCHOS_1_0 10000
@@ -248,6 +250,7 @@
248250
#define __WATCHOS_11_6 110600
249251
#define __WATCHOS_12_0 120000
250252
#define __WATCHOS_26_0 260000
253+
#define __WATCHOS_26_1 260100
251254
/* __WATCHOS__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
252255

253256
#define __TVOS_9_0 90000
@@ -308,6 +311,7 @@
308311
#define __TVOS_18_6 180600
309312
#define __TVOS_19_0 190000
310313
#define __TVOS_26_0 260000
314+
#define __TVOS_26_1 260100
311315
/* __TVOS__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
312316

313317
#define __BRIDGEOS_2_0 20000
@@ -345,6 +349,7 @@
345349
#define __BRIDGEOS_9_5 90500
346350
#define __BRIDGEOS_9_6 90600
347351
#define __BRIDGEOS_10_0 100000
352+
#define __BRIDGEOS_10_1 100100
348353

349354

350355
#define __DRIVERKIT_19_0 190000
@@ -369,6 +374,7 @@
369374
#define __DRIVERKIT_24_5 240500
370375
#define __DRIVERKIT_24_6 240600
371376
#define __DRIVERKIT_25_0 250000
377+
#define __DRIVERKIT_25_1 250100
372378
/* __DRIVERKIT__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
373379

374380
#define __VISIONOS_1_0 10000
@@ -384,6 +390,7 @@
384390
#define __VISIONOS_2_6 20600
385391
#define __VISIONOS_3_0 30000
386392
#define __VISIONOS_26_0 260000
393+
#define __VISIONOS_26_1 260100
387394
/* __VISIONOS__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
388395

389396

@@ -474,6 +481,7 @@
474481
#define MAC_OS_VERSION_15_6 __MAC_15_6
475482
#define MAC_OS_VERSION_16_0 __MAC_16_0
476483
#define MAC_OS_VERSION_26_0 __MAC_26_0
484+
#define MAC_OS_VERSION_26_1 __MAC_26_1
477485

478486
#endif /* #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE) */
479487

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Copyright (c) 2006-2012 Apple, Inc. All Rights Reserved.
3+
*
4+
* @APPLE_LICENSE_HEADER_START@
5+
*
6+
* This file contains Original Code and/or Modifications of Original Code
7+
* as defined in and that are subject to the Apple Public Source License
8+
* Version 2.0 (the 'License'). You may not use this file except in
9+
* compliance with the License. Please obtain a copy of the License at
10+
* http://www.opensource.apple.com/apsl/ and read it before using this
11+
* file.
12+
*
13+
* The Original Code and all software distributed under the License are
14+
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
15+
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
16+
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
17+
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
18+
* Please see the License for the specific language governing rights and
19+
* limitations under the License.
20+
*
21+
* @APPLE_LICENSE_HEADER_END@
22+
*/
23+
24+
#ifndef __COMMONCRYPTO_PUBLIC__
25+
#define __COMMONCRYPTO_PUBLIC__
26+
27+
#include <CommonCrypto/CommonCryptor.h>
28+
#include <CommonCrypto/CommonDigest.h>
29+
#include <CommonCrypto/CommonHMAC.h>
30+
#include <CommonCrypto/CommonKeyDerivation.h>
31+
#include <CommonCrypto/CommonSymmetricKeywrap.h>
32+
33+
#endif /* __COMMONCRYPTO_PUBLIC__ */
34+
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
//
2+
// CommonCryptoError.h
3+
// CommonCrypto
4+
//
5+
// Copyright (c) 2014 Platform Security. All rights reserved.
6+
//
7+
8+
#ifndef CommonCrypto_CommonCryptoError_h
9+
#define CommonCrypto_CommonCryptoError_h
10+
11+
/*
12+
* Copyright (c) 2014 Apple Inc. All Rights Reserved.
13+
*
14+
* @APPLE_LICENSE_HEADER_START@
15+
*
16+
* This file contains Original Code and/or Modifications of Original Code
17+
* as defined in and that are subject to the Apple Public Source License
18+
* Version 2.0 (the 'License'). You may not use this file except in
19+
* compliance with the License. Please obtain a copy of the License at
20+
* http://www.opensource.apple.com/apsl/ and read it before using this
21+
* file.
22+
*
23+
* The Original Code and all software distributed under the License are
24+
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
25+
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
26+
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
27+
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
28+
* Please see the License for the specific language governing rights and
29+
* limitations under the License.
30+
*
31+
* @APPLE_LICENSE_HEADER_END@
32+
*/
33+
34+
#include <stdint.h>
35+
36+
#if defined(__cplusplus)
37+
extern "C" {
38+
#endif
39+
40+
/*!
41+
@enum CCCryptorStatus
42+
@abstract Return values from CommonCryptor operations.
43+
44+
@constant kCCSuccess Operation completed normally.
45+
@constant kCCParamError Illegal parameter value.
46+
@constant kCCBufferTooSmall Insufficent buffer provided for specified
47+
operation.
48+
@constant kCCMemoryFailure Memory allocation failure.
49+
@constant kCCAlignmentError Input size was not aligned properly.
50+
@constant kCCDecodeError Input data did not decode or decrypt
51+
properly.
52+
@constant kCCUnimplemented Function not implemented for the current
53+
algorithm.
54+
@constant kCCInvalidKey Key is not valid.
55+
*/
56+
enum {
57+
kCCSuccess = 0,
58+
kCCParamError = -4300,
59+
kCCBufferTooSmall = -4301,
60+
kCCMemoryFailure = -4302,
61+
kCCAlignmentError = -4303,
62+
kCCDecodeError = -4304,
63+
kCCUnimplemented = -4305,
64+
kCCOverflow = -4306,
65+
kCCRNGFailure = -4307,
66+
kCCUnspecifiedError = -4308,
67+
kCCCallSequenceError= -4309,
68+
kCCKeySizeError = -4310,
69+
kCCInvalidKey = -4311,
70+
};
71+
typedef int32_t CCStatus;
72+
typedef int32_t CCCryptorStatus;
73+
74+
#if defined(__cplusplus)
75+
}
76+
#endif
77+
78+
#endif

0 commit comments

Comments
 (0)