From c6013725a8e9848f522250a07915f64459c28557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 11 Sep 2015 15:53:23 +0300 Subject: [PATCH] godeps: pull in ethash android fix --- Godeps/Godeps.json | 3 ++- Godeps/_workspace/src/github.com/ethereum/ethash/setup.py | 0 .../src/github.com/ethereum/ethash/src/libethash/endian.h | 4 ++-- .../_workspace/src/github.com/ethereum/ethash/test/c/test.sh | 0 .../src/github.com/ethereum/ethash/test/python/test.sh | 0 Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh | 0 6 files changed, 4 insertions(+), 3 deletions(-) mode change 100755 => 100644 Godeps/_workspace/src/github.com/ethereum/ethash/setup.py mode change 100755 => 100644 Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh mode change 100755 => 100644 Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh mode change 100755 => 100644 Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c939ae6707..7c6dd59b1e 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -21,7 +21,8 @@ }, { "ImportPath": "github.com/ethereum/ethash", - "Rev": "227ec953eae56f4f6c7f5e7dc93b4bbebf0cda2e" + "Comment": "v23.1-234-g062e40a", + "Rev": "062e40a1a1671f5a5102862b56e4c56f68a732f5" }, { "ImportPath": "github.com/fatih/color", diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py b/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py old mode 100755 new mode 100644 diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h index e32b1c5398..849325a596 100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h @@ -41,8 +41,8 @@ #define ethash_swap_u64(input_) swap64(input_) #else // posix #include -#define ethash_swap_u32(input_) __bswap_32(input_) -#define ethash_swap_u64(input_) __bswap_64(input_) +#define ethash_swap_u32(input_) bswap_32(input_) +#define ethash_swap_u64(input_) bswap_64(input_) #endif diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh old mode 100755 new mode 100644 diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh old mode 100755 new mode 100644 diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh old mode 100755 new mode 100644