commit 22949537426caf80b6b38b8316e02581012f5f55
author Xin Li <delphij@google.com> Mon Jul 01 20:59:21 2019 +0000
committer Xin Li <delphij@google.com> Mon Jul 01 20:59:21 2019 +0000
tree 32004465065b431a8ed1c140d25898dee2cee756
parent 47983a039473f3848647c93278e2d4ae9a5eff51
parent 6c8c7e7e4ac8e4d373bfba19b1ebb4d357d2ab6d

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

Bug: 134405016
Change-Id: I165847a78267e11e2a72f68a64750a9999af10ae

src/cn-cbor.c

diff --git a/src/cn-cbor.c b/src/cn-cbor.c
index 9093537..2526b92 100644
--- a/src/cn-cbor.c
+++ b/src/cn-cbor.c
@@ -53,7 +53,7 @@
 
 #ifndef CBOR_ALIGN_READS
 #define ntoh16p(p) (ntohs(*(unsigned short*)(p)))
-#define ntoh32p(p) (ntohl(*(unsigned long*)(p)))
+#define ntoh32p(p) (ntohl(*(uint32_t*)(p)))
 #else
 static uint16_t ntoh16p(unsigned char *p) {
     uint16_t tmp;