Merge pull request #1796 from karalabe/ethash-android-support

godeps: pull in ethash android fix
9 years ago · f1a4b330dd
parent 0eac601b5b c6013725a8
commit f1a4b330dd
6 changed files with 4 additions and 3 deletions
--- 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",
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py
--- 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 <byteswap.h>
-#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


--- a/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh