-
Notifications
You must be signed in to change notification settings - Fork 32
Fix htole64 and le64toh missing on non-linux platforms #12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
ilyalesokhin-starkware
merged 2 commits into
starkware-libs:master
from
software-mansion-labs:feat/portable-endian
Sep 8, 2022
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| #ifndef STARKWARE_CRYPTO_FFI_PORTABLE_ENDIAN_H_ | ||
| #define STARKWARE_CRYPTO_FFI_PORTABLE_ENDIAN_H_ | ||
|
|
||
| #if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__) | ||
|
|
||
| # define __WINDOWS__ | ||
|
|
||
| #endif | ||
|
|
||
| #if defined(__linux__) || defined(__CYGWIN__) | ||
|
|
||
| # include <endian.h> | ||
|
|
||
| #elif defined(__APPLE__) | ||
|
|
||
| # include <libkern/OSByteOrder.h> | ||
|
|
||
| # define htobe16(x) OSSwapHostToBigInt16(x) | ||
| # define htole16(x) OSSwapHostToLittleInt16(x) | ||
| # define be16toh(x) OSSwapBigToHostInt16(x) | ||
| # define le16toh(x) OSSwapLittleToHostInt16(x) | ||
|
|
||
| # define htobe32(x) OSSwapHostToBigInt32(x) | ||
| # define htole32(x) OSSwapHostToLittleInt32(x) | ||
| # define be32toh(x) OSSwapBigToHostInt32(x) | ||
| # define le32toh(x) OSSwapLittleToHostInt32(x) | ||
|
|
||
| # define htobe64(x) OSSwapHostToBigInt64(x) | ||
| # define htole64(x) OSSwapHostToLittleInt64(x) | ||
| # define be64toh(x) OSSwapBigToHostInt64(x) | ||
| # define le64toh(x) OSSwapLittleToHostInt64(x) | ||
|
|
||
| # define __BYTE_ORDER BYTE_ORDER | ||
| # define __BIG_ENDIAN BIG_ENDIAN | ||
| # define __LITTLE_ENDIAN LITTLE_ENDIAN | ||
| # define __PDP_ENDIAN PDP_ENDIAN | ||
|
|
||
| #elif defined(__OpenBSD__) | ||
|
|
||
| # include <sys/endian.h> | ||
|
|
||
| #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) | ||
|
|
||
| # include <sys/endian.h> | ||
|
|
||
| # define be16toh(x) betoh16(x) | ||
| # define le16toh(x) letoh16(x) | ||
|
|
||
| # define be32toh(x) betoh32(x) | ||
| # define le32toh(x) letoh32(x) | ||
|
|
||
| # define be64toh(x) betoh64(x) | ||
| # define le64toh(x) letoh64(x) | ||
|
|
||
| #elif defined(__WINDOWS__) | ||
|
|
||
| # include <winsock2.h> | ||
| # include <sys/param.h> | ||
|
|
||
| # if BYTE_ORDER == LITTLE_ENDIAN | ||
|
|
||
| # define htobe16(x) htons(x) | ||
| # define htole16(x) (x) | ||
| # define be16toh(x) ntohs(x) | ||
| # define le16toh(x) (x) | ||
|
|
||
| # define htobe32(x) htonl(x) | ||
| # define htole32(x) (x) | ||
| # define be32toh(x) ntohl(x) | ||
| # define le32toh(x) (x) | ||
|
|
||
| # define htobe64(x) htonll(x) | ||
| # define htole64(x) (x) | ||
| # define be64toh(x) ntohll(x) | ||
| # define le64toh(x) (x) | ||
|
|
||
| # elif BYTE_ORDER == BIG_ENDIAN | ||
|
|
||
| /* that would be xbox 360 */ | ||
| # define htobe16(x) (x) | ||
| # define htole16(x) __builtin_bswap16(x) | ||
| # define be16toh(x) (x) | ||
| # define le16toh(x) __builtin_bswap16(x) | ||
|
|
||
| # define htobe32(x) (x) | ||
| # define htole32(x) __builtin_bswap32(x) | ||
| # define be32toh(x) (x) | ||
| # define le32toh(x) __builtin_bswap32(x) | ||
|
|
||
| # define htobe64(x) (x) | ||
| # define htole64(x) __builtin_bswap64(x) | ||
| # define be64toh(x) (x) | ||
| # define le64toh(x) __builtin_bswap64(x) | ||
|
|
||
| # else | ||
|
|
||
| # error byte order not supported | ||
|
|
||
| # endif | ||
|
|
||
| # define __BYTE_ORDER BYTE_ORDER | ||
| # define __BIG_ENDIAN BIG_ENDIAN | ||
| # define __LITTLE_ENDIAN LITTLE_ENDIAN | ||
| # define __PDP_ENDIAN PDP_ENDIAN | ||
|
|
||
| #else | ||
|
|
||
| # error platform not supported | ||
|
|
||
| #endif | ||
|
|
||
| #endif // STARKWARE_CRYPTO_FFI_PORTABLE_ENDIAN_H_ | ||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you strip the license header?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I strip it from https://github.com/sahlberg/libsmb2/blob/master/include/portable-endian.h since author placed in public domain.