diff options
| author | Bill Rassieur <rassb@google.com> | 2019-04-02 18:29:31 +0000 |
|---|---|---|
| committer | Bill Rassieur <rassb@google.com> | 2019-04-02 18:29:31 +0000 |
| commit | a153c76dd4034df6e5a8146391110cb1000f4b9a (patch) | |
| tree | d018a6acd32a9e3700bbe9d4d6b7b5cca533cf51 | |
| parent | 0f79533b608b0cfe28634ef8389931d8b6915e2b (diff) | |
| parent | 68f26babcee9c1fa6fc6edaa6ccd8acbe781caab (diff) | |
| download | cn-cbor-a153c76dd4034df6e5a8146391110cb1000f4b9a.tar.gz | |
Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I1593b7768d8c76217fb5d30a7459057595f82b25
BUG: 129345239
| -rw-r--r-- | src/cn-cbor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cn-cbor.c b/src/cn-cbor.c index a7677ae..8fadf73 100644 --- a/src/cn-cbor.c +++ b/src/cn-cbor.c @@ -52,7 +52,7 @@ static double decode_half(int half) { /* Fix these if you can't do non-aligned reads */ #define ntoh8p(p) (*(unsigned char*)(p)) #define ntoh16p(p) (ntohs(*(unsigned short*)(p))) -#define ntoh32p(p) (ntohl(*(unsigned long*)(p))) +#define ntoh32p(p) (ntohl(*(uint32_t*)(p))) static uint64_t ntoh64p(unsigned char *p) { uint64_t ret = ntoh32p(p); ret <<= 32; |