Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ddbdcd4 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Fix the implementation of htonll()" am: 3279c898

am: 3b89ae6d

Change-Id: I056cb3496c0c572c710e2c60a5ac5a9812d0cdb9
parents 655f96f6 3b89ae6d
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -194,9 +194,11 @@ typedef struct {
} __attribute__((__packed__)) btsnoop_header_t;

static uint64_t htonll(uint64_t ll) {
  uint32_t l = 1;
  if (*(reinterpret_cast<uint8_t*>(&l)) == 1)
    return htonl((ll & 0xffffffff) << 32LL) | htonl(ll >> 32);
  const uint32_t l = 1;
  if (*(reinterpret_cast<const uint8_t*>(&l)) == 1)
    return static_cast<uint64_t>(htonl(ll & 0xffffffff)) << 32 |
           htonl(ll >> 32);

  return ll;
}