-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
[cpprestsdk] fix bad define in header for clang #38659
Merged
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 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,52 @@ | ||
| diff --git a/Release/include/cpprest/details/cpprest_compat.h b/Release/include/cpprest/details/cpprest_compat.h | ||
| index bf107479..00581371 100644 | ||
| --- a/Release/include/cpprest/details/cpprest_compat.h | ||
| +++ b/Release/include/cpprest/details/cpprest_compat.h | ||
| @@ -29,7 +29,6 @@ | ||
| #else // ^^^ _WIN32 ^^^ // vvv !_WIN32 vvv | ||
|
|
||
| #define __declspec(x) __attribute__((x)) | ||
| -#define dllimport | ||
| #define novtable /* no novtable equivalent */ | ||
| #define __assume(x) \ | ||
| do \ | ||
| @@ -74,9 +73,17 @@ | ||
| #define _ASYNCRTIMP_TYPEINFO | ||
| #else // ^^^ _NO_ASYNCRTIMP ^^^ // vvv !_NO_ASYNCRTIMP vvv | ||
| #ifdef _ASYNCRT_EXPORT | ||
| +#ifdef _WIN32 | ||
| #define _ASYNCRTIMP __declspec(dllexport) | ||
| +#else | ||
| +#define _ASYNCRTIMP __attribute__((visibility("default"))) | ||
| +#endif | ||
| #else // ^^^ _ASYNCRT_EXPORT ^^^ // vvv !_ASYNCRT_EXPORT vvv | ||
| +#ifdef _WIN32 | ||
| #define _ASYNCRTIMP __declspec(dllimport) | ||
| +#else | ||
| +#define _ASYNCRTIMP | ||
| +#endif | ||
| #endif // _ASYNCRT_EXPORT | ||
|
|
||
| #if defined(_WIN32) | ||
| diff --git a/Release/include/pplx/pplx.h b/Release/include/pplx/pplx.h | ||
| index d9ba9c61..8d36252c 100644 | ||
| --- a/Release/include/pplx/pplx.h | ||
| +++ b/Release/include/pplx/pplx.h | ||
| @@ -30,9 +30,17 @@ | ||
| #define _PPLXIMP | ||
| #else | ||
| #ifdef _PPLX_EXPORT | ||
| +#ifdef _WIN32 | ||
| #define _PPLXIMP __declspec(dllexport) | ||
| #else | ||
| +#define _PPLXIMP __attribute__((visibility("default"))) | ||
| +#endif | ||
| +#else | ||
| +#ifdef _WIN32 | ||
| #define _PPLXIMP __declspec(dllimport) | ||
| +#else | ||
| +#define _PPLXIMP | ||
| +#endif | ||
| #endif | ||
| #endif | ||
|
|
||
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
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
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
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
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.
I wonder if these checks should be
#ifdef _MSC_VERinstead.__declspec(dllexport)is a compiler specific attribute not a platform specific one.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.
The attribute is also implemented by mingw, and widely used with
_WIN32. So it is okay IMO.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.
Also implemented by clang.