aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-06-13 17:43:09 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-06-13 17:43:09 +0800
commitf0134f363bf62ba18668c2524050f14b2a43b6bd (patch)
treeb60dae03154ad5cebac9ce442c30e65f822799b9
parentce88d41907f0cb1146a2f7228ccd61669f8d8b91 (diff)
downloaddexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.tar
dexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.tar.gz
dexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.tar.bz2
dexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.tar.lz
dexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.tar.xz
dexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.tar.zst
dexon-f0134f363bf62ba18668c2524050f14b2a43b6bd.zip
Godeps: pull in ethash with the big endian build fix
-rw-r--r--Godeps/Godeps.json4
-rwxr-xr-x[-rw-r--r--]Godeps/_workspace/src/github.com/ethereum/ethash/setup.py0
-rw-r--r--Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h29
-rw-r--r--Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c2
4 files changed, 17 insertions, 18 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 36104b456..9b5b9a44f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -20,8 +20,8 @@
},
{
"ImportPath": "github.com/ethereum/ethash",
- "Comment": "v23.1-245-g25b32de",
- "Rev": "25b32de0c0271065c28c3719c2bfe86959d72f0c"
+ "Comment": "v23.1-247-g2e80de5",
+ "Rev": "2e80de5022370cfe632195b1720db52d07ff8a77"
},
{
"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 100644..100755
--- 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 849325a59..5b8abf03d 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
@@ -19,7 +19,7 @@
# define BYTE_ORDER LITTLE_ENDIAN
#elif defined( __QNXNTO__ ) && defined( __BIGENDIAN__ )
# define BIG_ENDIAN 1234
- # define BYTE_ORDER BIG_ENDIAN
+ # define BYTE_ORDER BIG_ENDIAN
#else
# include <endian.h>
#endif
@@ -59,21 +59,20 @@
#define fix_endian32(dst_, src_) dst_ = ethash_swap_u32(src_)
#define fix_endian32_same(val_) val_ = ethash_swap_u32(val_)
-#define fix_endian64(dst_, src_) dst_ = ethash_swap_u64(src_
+#define fix_endian64(dst_, src_) dst_ = ethash_swap_u64(src_)
#define fix_endian64_same(val_) val_ = ethash_swap_u64(val_)
-#define fix_endian_arr32(arr_, size_) \
- do { \
- for (unsigned i_ = 0; i_ < (size_), ++i_) { \
- arr_[i_] = ethash_swap_u32(arr_[i_]); \
- } \
- while (0)
-#define fix_endian_arr64(arr_, size_) \
- do { \
- for (unsigned i_ = 0; i_ < (size_), ++i_) { \
- arr_[i_] = ethash_swap_u64(arr_[i_]); \
- } \
- while (0) \
-
+#define fix_endian_arr32(arr_, size_) \
+ do { \
+ for (unsigned i_ = 0; i_ < (size_); ++i_) { \
+ arr_[i_] = ethash_swap_u32(arr_[i_]); \
+ } \
+ } while (0)
+#define fix_endian_arr64(arr_, size_) \
+ do { \
+ for (unsigned i_ = 0; i_ < (size_); ++i_) { \
+ arr_[i_] = ethash_swap_u64(arr_[i_]); \
+ } \
+ } while (0)
#else
# error "endian not supported"
#endif // BYTE_ORDER
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c
index 338aa5ecd..0a830fc82 100644
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c
@@ -257,7 +257,7 @@ static bool ethash_hash(
void ethash_quick_hash(
ethash_h256_t* return_hash,
ethash_h256_t const* header_hash,
- uint64_t const nonce,
+ uint64_t nonce,
ethash_h256_t const* mix_hash
)
{