Skip to content

Commit 4087419

Browse files
committed
This was causing build failures on AArch64 due to name resolution ambiguity.
1 parent dbb244a commit 4087419

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/aarch64_linux.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,13 @@ macro_rules! or {
266266
};
267267
}
268268

269-
// See `generate_aarch64_outlined_atomics` in build.rs.
270-
include!(concat!(env!("OUT_DIR"), "/outlined_atomics.rs"));
269+
// Work around https://github.com/rust-lang/rust/issues/113533
270+
#[macro_use]
271+
mod macros {
272+
// See `generate_aarch64_outlined_atomics` in build.rs.
273+
include!(concat!(env!("OUT_DIR"), "/outlined_atomics.rs"));
274+
}
275+
271276
foreach_cas!(compare_and_swap);
272277
foreach_cas16!(compare_and_swap_i128);
273278
foreach_swp!(swap);

0 commit comments

Comments
 (0)