diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 17:33:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-04-10 17:33:14 +0000 |
| commit | 63e88f60a769f2535945db0e1cabb9815ff45a77 (patch) | |
| tree | cea2359bc9b5b4e3acce7aeca59a2f9b5d251bcb /src/3rdparty/tinycbor/src/compilersupport_p.h | |
| parent | 0bdded64accc3f654b2d12d9bfaf64f842cedf26 (diff) | |
| parent | ff88e20b8328b6aad5b787aacc5c39da563a67b1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/3rdparty/tinycbor/src/compilersupport_p.h')
| -rw-r--r-- | src/3rdparty/tinycbor/src/compilersupport_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/tinycbor/src/compilersupport_p.h b/src/3rdparty/tinycbor/src/compilersupport_p.h index 2b9491d34d..bd10efc9c7 100644 --- a/src/3rdparty/tinycbor/src/compilersupport_p.h +++ b/src/3rdparty/tinycbor/src/compilersupport_p.h @@ -106,7 +106,7 @@ # define cbor_ntohs __builtin_bswap16 # define cbor_htons __builtin_bswap16 # else -# define cbor_ntohs(x) (((uint16_t)x >> 8) | ((uint16_t)x << 8)) +# define cbor_ntohs(x) (((uint16_t)(x) >> 8) | ((uint16_t)(x) << 8)) # define cbor_htons cbor_ntohs # endif # else |