Do not include env_win.cc on non-Windows systems#8826
Merged
laanwj merged 1 commit intobitcoin:masterfrom Sep 29, 2016
Merged
Conversation
Member
|
utACK 7e5fd71 |
Member
|
This currently matches the upstream behavior, though it's clearly not right. |
Member
That's our own fault, env_win.cc doesn't exist in the real upstream. It's a simplified windows platform created by me to work around windows-shutdown-during-sync issues in upstream. See bitcoin-core/leveldb-subtree#9 and #6917 . |
laanwj
added a commit
that referenced
this pull request
Sep 29, 2016
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Jan 12, 2018
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
andvgal
pushed a commit
to energicryptocurrency/gen2-energi
that referenced
this pull request
Jan 6, 2019
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Sep 25, 2020
Update LevelDB to upstream commit f545dfabf Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#7911 - bitcoin/bitcoin#7982 - bitcoin/bitcoin#8133 - bitcoin/bitcoin#8784 - Only the missing changes. - bitcoin/bitcoin#8826 - bitcoin/bitcoin#8613 - bitcoin/bitcoin#10544 - bitcoin/bitcoin#10633 - Only the changes to files and code we have. - bitcoin/bitcoin#10806 - bitcoin/bitcoin#10958 - bitcoin/bitcoin#12451 - bitcoin/bitcoin#13925 - bitcoin/bitcoin#15270 This upgrades LevelDB in the exact same commit progression as upstream, up to January 2019.
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This solves bitcoin-core/leveldb-subtree#8
The file
env_win.ccis included twice on Windows and once for all other systems. But it is not needed at all there.This removes this warning on OS X: