diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-09-12 06:26:01 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-09-12 06:26:01 +0800 |
| commit | f1a4b330dd281a37454df873c97afc7c700b61f2 (patch) | |
| tree | 0dce6650b489cda70301380c2e72cd7e2baf4f0c | |
| parent | 0eac601b5b67ce15201901710fd6be089ccb8b6e (diff) | |
| parent | c6013725a8e9848f522250a07915f64459c28557 (diff) | |
| download | go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.tar go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.tar.gz go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.tar.bz2 go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.tar.lz go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.tar.xz go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.tar.zst go-tangerine-f1a4b330dd281a37454df873c97afc7c700b61f2.zip | |
Merge pull request #1796 from karalabe/ethash-android-support
godeps: pull in ethash android fix
| -rw-r--r-- | Godeps/Godeps.json | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | Godeps/_workspace/src/github.com/ethereum/ethash/setup.py | 0 | ||||
| -rw-r--r-- | Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh | 0 |
6 files changed, 4 insertions, 3 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c939ae670..7c6dd59b1 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 index 18aa20f6d..18aa20f6d 100755..100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py 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 e32b1c539..849325a59 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 <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 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 index 92b6b8b66..92b6b8b66 100755..100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh 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 index 05c66b550..05c66b550 100755..100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh b/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh index aaeaa878c..aaeaa878c 100755..100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh |