diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-17 13:51:42 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-17 08:51:51 -0500 |
| commit | 7eacde32d81ae1d821e51fb03b6caee8da87c889 (patch) | |
| tree | 0ad7443154c7f147c9b1018aadfbe55b54821eed /Utilities/cmnghttp2/lib/nghttp2_net.h | |
| parent | 31a8e05d46c918313a8c33d79df046e0527719ca (diff) | |
| parent | 5872d9bd4d330a5dfe9d2ab5d749f1f319a5dad6 (diff) | |
| download | cmake-7eacde32d81ae1d821e51fb03b6caee8da87c889.tar.gz | |
Merge topic 'update-nghttp2'
5872d9bd4d Merge branch 'upstream-nghttp2' into update-nghttp2
7eee97387a nghttp2 2023-02-13 (be049129)
b9221fcc17 nghttp2: Update script to get nghttp2 1.52.0
36d31dc996 Merge branch 'upstream-nghttp2' into update-nghttp2
2355f50277 nghttp2 2022-09-21 (87fef4ab)
1ca53784ca nghttp2: Update import script to fix version header
bfca444b92 nghttp2: Drop unused configuration value from build within CMake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8217
Diffstat (limited to 'Utilities/cmnghttp2/lib/nghttp2_net.h')
| -rw-r--r-- | Utilities/cmnghttp2/lib/nghttp2_net.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmnghttp2/lib/nghttp2_net.h b/Utilities/cmnghttp2/lib/nghttp2_net.h index 345f6c834f..521f98143e 100644 --- a/Utilities/cmnghttp2/lib/nghttp2_net.h +++ b/Utilities/cmnghttp2/lib/nghttp2_net.h @@ -71,9 +71,9 @@ STIN uint16_t htons(uint16_t hostshort) { STIN uint32_t ntohl(uint32_t netlong) { uint32_t res; unsigned char *p = (unsigned char *)&netlong; - res = *p++ << 24; - res += *p++ << 16; - res += *p++ << 8; + res = (uint32_t)(*p++ << 24); + res += (uint32_t)(*p++ << 16); + res += (uint32_t)(*p++ << 8); res += *p; return res; } @@ -81,7 +81,7 @@ STIN uint32_t ntohl(uint32_t netlong) { STIN uint16_t ntohs(uint16_t netshort) { uint16_t res; unsigned char *p = (unsigned char *)&netshort; - res = *p++ << 8; + res = (uint16_t)(*p++ << 8); res += *p; return res; } |