Merge Tweaks Originating in Merge Review Comments

This merges several small changes that were made in response to
comments that arose when LMP changes were merged into the Widevine
repository's master branch.

Change-Id: Ifec968af54dbc3288f24654ec0c6ca9b5962e1aa
This commit is contained in:
John "Juce" Bruce
2015-03-10 15:22:11 -07:00
parent fb6d83398c
commit 1bd405fc40
11 changed files with 32 additions and 52 deletions

View File

@@ -185,21 +185,4 @@ int64_t htonll64(int64_t x) { // Convert to big endian (network-byte-order)
}
}
int64_t ntohll64(int64_t x) { // Convert from big endian (network-byte-order)
union {
uint32_t array[2];
int64_t number;
} mixed;
mixed.number = 1;
if (mixed.array[0] == 1) { // Little Endian.
mixed.number = x;
uint32_t temp = mixed.array[0];
mixed.array[0] = ntohl(mixed.array[1]);
mixed.array[1] = ntohl(temp);
return mixed.number;
} else { // Big Endian.
return x;
}
}
} // namespace wvcdm