Tweak nghttp3_ntohl64/nghttp3_htonl64 definitions #135
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
tatsuhiro-t
commented
May 29, 2023
tatsuhiro-t
commented
- Only define nghttp3_bswap64 for little endian platform.
- Use _byteswap_uint64 for win32.
- Use OSSwapInt64 for apple platform.
- Only define nghttp3_bswap64 for little endian platform. - Use _byteswap_uint64 for win32. - Use OSSwapInt64 for apple platform.
lhuang04
reviewed
May 31, 2023
| # define nghttp3_bswap64 OSSwapInt64 | ||
| # else /* !HAVE_BSWAP_64 && !WIN32 && !__APPLE__ */ | ||
| # define nghttp3_bswap64(N) \ | ||
| ((uint64_t)(nghttp3_ntohl((uint32_t)(N))) << 32 | \ |
There was a problem hiding this comment.
This may be a bug for Android. We got the following compile error after rebasing to this commit.
ld.lld: error: undefined symbol: nghttp3_ntohl
>>> referenced by nghttp3_conv.c:58 (third-party/nghttp3/lib/nghttp3_conv.c:58)
>>> ../nghttp3#compile-pic-nghttp3_conv.c.o2a37e81d,platform010-clang/lib/nghttp3_conv.c.o:(nghttp3_get_varint)
There is no function or macro for nghttp3_ntohl. The following fixes the compile error.
diff --git a/third-party/nghttp3/lib/nghttp3_conv.h b/third-party/nghttp3/lib/nghttp3_conv.h
--- a/third-party/nghttp3/lib/nghttp3_conv.h
+++ b/third-party/nghttp3/lib/nghttp3_conv.h
@@ -74,8 +74,8 @@
# define nghttp3_bswap64 OSSwapInt64
# else /* !HAVE_BSWAP_64 && !WIN32 && !__APPLE__ */
# define nghttp3_bswap64(N) \
- ((uint64_t)(nghttp3_ntohl((uint32_t)(N))) << 32 | \
- nghttp3_ntohl((uint32_t)((N) >> 32)))
+ ((uint64_t)(ntohl((uint32_t)(N))) << 32 | \
+ ntohl((uint32_t)((N) >> 32)))
# endif /* !HAVE_BSWAP_64 && !WIN32 && !__APPLE__ */
# define nghttp3_ntohl64(N) nghttp3_bswap64(N)
# define nghttp3_htonl64(N) nghttp3_bswap64(N)
lhuang04
added a commit
to lhuang04/nghttp3
that referenced
this pull request
May 31, 2023
Summary: Fix compile error for Android/Linux - undefined symbol: nghttp3_ntohl Summary: Found the following compile error when we build the latest nghttp3 for Android/Linux. ``` ld.lld: error: undefined symbol: nghttp3_ntohl >>> referenced by nghttp3_conv.c:58 (third-party/nghttp3/lib/nghttp3_conv.c:58) >>> ../nghttp3#compile-pic-nghttp3_conv.c.o2a37e81d,platform010-clang/lib/nghttp3_conv.c.o:(nghttp3_get_varint) ``` nghttp3_ntohl is not a function or macro. We should use ntohl instead which is also part of previos logic in ngtcp2#135. Test Plan: Compile and check no error. Reviewers: Subscribers: Tasks: Tags:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.