Merge pull request #16 from echom/master

wrapping ntohll in ifndef for mac
2015-09-29 17:17:11 +03:00 · 2015-09-29 17:17:11 +03:00 · 6e74d4f1af
commit 6e74d4f1af
parent cdd490ee02 b3239d25a1
1 changed files with 2 additions and 0 deletions
--- a/src/pow.cc
+++ b/src/pow.cc
@ -36,12 +36,14 @@ typedef struct {
  PowArgs* pow_args;
 } ThreadArgs;

+#ifndef ntohll
 inline uint64_t ntohll(uint64_t x) {
  return (
      ((uint64_t)(ntohl( (unsigned int)((x << 32) >> 32) )) << 32) |
      ntohl( ((unsigned int)(x >> 32)) )
  );
 }
+#endif

 // Set POW computation result in a thread-safe way.
 void set_result(PowArgs* pow_args, PowResult res, uint64_t nonce) {