Merge pull request #695

f5affbe More for df239428c0 (Howard Chu)
2016-03-05 23:05:29 +02:00 · 2016-03-05 23:05:29 +02:00 · 80aa57a6cd
commit 80aa57a6cd
parent a7310031f4 f5affbef26
1 changed files with 6 additions and 0 deletions
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@ -149,8 +149,14 @@ private:

 int compare_uint64(const MDB_val *a, const MDB_val *b)
 {
+#ifdef MISALIGNED_OK
  const uint64_t va = *(const uint64_t*)a->mv_data;
  const uint64_t vb = *(const uint64_t*)b->mv_data;
+#else
+  uint64_t va, vb;
+  memcpy(&va, a->mv_data, sizeof(uint64_t));
+  memcpy(&vb, b->mv_data, sizeof(uint64_t));
+#endif
  if (va < vb) return -1;
  else if (va == vb) return 0;
  else return 1;