CIndexStoreDB: correct dllstorage annotation #41
Merged
Conversation
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
The `INDEXSTORE_PUBLIC` macro was guarding based on `_MSC_VER` which is a check for MSVC's compiler which is incorrect. This annotation has nothing to do with the MSVC compiler but rather the PE/COFF file format. Adjust that to `_WIN32` as an alias for Windows. Furthermore, correct the annotation - the functions should be given dllexport storage when building IndexStoreDB, and dllimport storage when building code which uses IndexStoreDB (unless it is statically built).
|
@swift-ci please smoke test |
|
@swift-ci please test |
benlangmuir
reviewed
Aug 12, 2019
| # if defined (_MSC_VER) | ||
| # define INDEXSTOREDB_PUBLIC __declspec(dllimport) | ||
| # if defined(_WIN32) && defined(_DLL) | ||
| # if defined(CIndexStoreDB_EXPORTS) |
There was a problem hiding this comment.
Is anything setting CIndexStoreDB_EXPORTS in swiftpm?
There was a problem hiding this comment.
No, that should be set when compiling the sources for it. CMake does that implicitly. I’ll upload a separate patch for that.
benlangmuir
approved these changes
Aug 12, 2019
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.
The
INDEXSTORE_PUBLICmacro was guarding based on_MSC_VERwhich isa check for MSVC's compiler which is incorrect. This annotation has
nothing to do with the MSVC compiler but rather the PE/COFF file format.
Adjust that to
_WIN32as an alias for Windows.Furthermore, correct the annotation - the functions should be given
dllexport storage when building IndexStoreDB, and dllimport storage when
building code which uses IndexStoreDB (unless it is statically built).