commit 6c8c7e7e4ac8e4d373bfba19b1ebb4d357d2ab6d
author Haibo Huang <hhb@google.com> Fri May 03 16:35:26 2019 -0700
committer Haibo Huang <hhb@google.com> Fri May 03 23:39:16 2019 +0000
tree 32004465065b431a8ed1c140d25898dee2cee756
parent d42fc3b49cda5c21aee74f0ec7bd06e1bcab8731
parent 47983a039473f3848647c93278e2d4ae9a5eff51

resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to qt-dev-plus-aosp

Exempt-From-Owner-Approval: Solve merge conflict
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idc64b93a422757ad92113b2902908d96730c772e

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;