Merged revisions 301263 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301263 | tilghman | 2011-01-10 16:39:31 -0600 (Mon, 10 Jan 2011) | 8 lines

  Little endian machines were not converted properly.

  (closes issue #18583)
  Reported by: jcovert
  Patches:
        20110110__issue18583.diff.txt uploaded by tilghman (license 14)
  Tested by: jcovert
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301264 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/strcompat.c b/main/strcompat.c
index e718cc6..97faae7 100644 (file)
--- a/main/strcompat.c
+++ b/main/strcompat.c
@@ -367,14 +367,14 @@ uint64_t ntohll(uint64_t net64)
        } number;
        number.u = net64;
        return
-               (((uint64_t) number.c[0]) <<  0) |
-               (((uint64_t) number.c[1]) <<  8) |
-               (((uint64_t) number.c[2]) << 16) |
-               (((uint64_t) number.c[3]) << 24) |
-               (((uint64_t) number.c[4]) << 32) |
-               (((uint64_t) number.c[5]) << 40) |
-               (((uint64_t) number.c[6]) << 48) |
-               (((uint64_t) number.c[7]) << 56);
+               (((uint64_t) number.c[0]) << 56) |
+               (((uint64_t) number.c[1]) << 48) |
+               (((uint64_t) number.c[2]) << 40) |
+               (((uint64_t) number.c[3]) << 32) |
+               (((uint64_t) number.c[4]) << 24) |
+               (((uint64_t) number.c[5]) << 16) |
+               (((uint64_t) number.c[6]) <<  8) |
+               (((uint64_t) number.c[7]) <<  0);
 #else
        #error "Unknown byte order"
 #endif
@@ -393,14 +393,14 @@ uint64_t htonll(uint64_t host64)
        } number;
        number.u = host64;
        return
-               (((uint64_t) number.c[0]) <<  0) |
-               (((uint64_t) number.c[1]) <<  8) |
-               (((uint64_t) number.c[2]) << 16) |
-               (((uint64_t) number.c[3]) << 24) |
-               (((uint64_t) number.c[4]) << 32) |
-               (((uint64_t) number.c[5]) << 40) |
-               (((uint64_t) number.c[6]) << 48) |
-               (((uint64_t) number.c[7]) << 56);
+               (((uint64_t) number.c[0]) << 56) |
+               (((uint64_t) number.c[1]) << 48) |
+               (((uint64_t) number.c[2]) << 40) |
+               (((uint64_t) number.c[3]) << 32) |
+               (((uint64_t) number.c[4]) << 24) |
+               (((uint64_t) number.c[5]) << 16) |
+               (((uint64_t) number.c[6]) <<  8) |
+               (((uint64_t) number.c[7]) <<  0);
 #else
        #error "Unknown byte order"
 #endif