about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-01 13:06:09 +0000
committerbors <bors@rust-lang.org>2014-09-01 13:06:09 +0000
commitb42e079c6f6445b4e2adfaf9a30e8a06403f75c8 (patch)
tree1d11f8afa0b662a584229f2d79b2a54735dd06c0 /src
parent12b438c31b0a2923acc47927080624d20493c226 (diff)
parent0061b36a7727876c58b1b2c29cadc68d6047a03c (diff)
downloadrust-b42e079c6f6445b4e2adfaf9a30e8a06403f75c8.tar.gz
rust-b42e079c6f6445b4e2adfaf9a30e8a06403f75c8.zip
auto merge of #16871 : retep998/rust/win64-fix, r=alexcrichton
It was in a x86_64 block so the buildbots didn't notice it.
Fixes #16905 
Diffstat (limited to 'src')
-rw-r--r--src/librustrt/unwind.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustrt/unwind.rs b/src/librustrt/unwind.rs
index 08e182a6d6e..9de58960c5e 100644
--- a/src/librustrt/unwind.rs
+++ b/src/librustrt/unwind.rs
@@ -397,7 +397,7 @@ pub mod eabi {
 #[cfg(windows, target_arch = "x86_64", not(test))]
 #[doc(hidden)]
 #[allow(visible_private_types)]
-#[allow(non_camel_case_types)]
+#[allow(non_camel_case_types, non_snake_case)]
 pub mod eabi {
     use libunwind as uw;
     use libc::{c_void, c_int};