Merge branch 'master' into ethminer_crate

Conflicts: util/bigint/src/uint.rs
2016-03-11 16:24:52 +01:00
parent 0dbe6684ad 5d3ead91e2
commit 9f19d2993c
2 changed files with 1 additions and 3 deletions
--- a/util/bigint/src/uint.rs
+++ b/util/bigint/src/uint.rs
@@ -36,6 +36,7 @@
 //! The functions here are designed to be fast.
 //!

+#[cfg(all(asm_available, target_arch="x86_64"))]
 use std::mem;
 use std::fmt;
 use std::cmp;