@@ -62,7 +62,7 @@ impl fmt::Debug for c_void {
62
62
// The name is WIP, using `VaListImpl` for now.
63
63
#[ cfg( any(
64
64
all( not( target_arch = "aarch64" ) , not( target_arch = "powerpc" ) , not( target_arch = "x86_64" ) ) ,
65
- all( target_arch = "aarch64" , target_os = "ios" ) ,
65
+ all( target_arch = "aarch64" , any ( target_os = "macos" , target_os = " ios") ) ,
66
66
target_arch = "wasm32" ,
67
67
target_arch = "asmjs" ,
68
68
windows
@@ -85,7 +85,7 @@ pub struct VaListImpl<'f> {
85
85
86
86
#[ cfg( any(
87
87
all( not( target_arch = "aarch64" ) , not( target_arch = "powerpc" ) , not( target_arch = "x86_64" ) ) ,
88
- all( target_arch = "aarch64" , target_os = "ios" ) ,
88
+ all( target_arch = "aarch64" , any ( target_os = "macos" , target_os = " ios") ) ,
89
89
target_arch = "wasm32" ,
90
90
target_arch = "asmjs" ,
91
91
windows
@@ -107,7 +107,11 @@ impl<'f> fmt::Debug for VaListImpl<'f> {
107
107
///
108
108
/// [AArch64 Procedure Call Standard]:
109
109
/// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf
110
- #[ cfg( all( target_arch = "aarch64" , not( target_os = "ios" ) , not( windows) ) ) ]
110
+ #[ cfg( all(
111
+ target_arch = "aarch64" ,
112
+ not( any( target_os = "macos" , target_os = "ios" ) ) ,
113
+ not( windows)
114
+ ) ) ]
111
115
#[ repr( C ) ]
112
116
#[ derive( Debug ) ]
113
117
#[ unstable(
@@ -181,7 +185,7 @@ pub struct VaList<'a, 'f: 'a> {
181
185
not( target_arch = "powerpc" ) ,
182
186
not( target_arch = "x86_64" )
183
187
) ,
184
- all( target_arch = "aarch64" , target_os = "ios" ) ,
188
+ all( target_arch = "aarch64" , any ( target_os = "macos" , target_os = " ios") ) ,
185
189
target_arch = "wasm32" ,
186
190
target_arch = "asmjs" ,
187
191
windows
@@ -190,7 +194,7 @@ pub struct VaList<'a, 'f: 'a> {
190
194
191
195
#[ cfg( all(
192
196
any( target_arch = "aarch64" , target_arch = "powerpc" , target_arch = "x86_64" ) ,
193
- any( not( target_arch = "aarch64" ) , not( target_os = "ios" ) ) ,
197
+ any( not( target_arch = "aarch64" ) , not( any ( target_os = "macos" , target_os = " ios") ) ) ,
194
198
not( target_arch = "wasm32" ) ,
195
199
not( target_arch = "asmjs" ) ,
196
200
not( windows)
@@ -202,7 +206,7 @@ pub struct VaList<'a, 'f: 'a> {
202
206
203
207
#[ cfg( any(
204
208
all( not( target_arch = "aarch64" ) , not( target_arch = "powerpc" ) , not( target_arch = "x86_64" ) ) ,
205
- all( target_arch = "aarch64" , target_os = "ios" ) ,
209
+ all( target_arch = "aarch64" , any ( target_os = "macos" , target_os = " ios") ) ,
206
210
target_arch = "wasm32" ,
207
211
target_arch = "asmjs" ,
208
212
windows
@@ -223,7 +227,7 @@ impl<'f> VaListImpl<'f> {
223
227
224
228
#[ cfg( all(
225
229
any( target_arch = "aarch64" , target_arch = "powerpc" , target_arch = "x86_64" ) ,
226
- any( not( target_arch = "aarch64" ) , not( target_os = "ios" ) ) ,
230
+ any( not( target_arch = "aarch64" ) , not( any ( target_os = "macos" , target_os = " ios") ) ) ,
227
231
not( target_arch = "wasm32" ) ,
228
232
not( target_arch = "asmjs" ) ,
229
233
not( windows)
0 commit comments