diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-30 15:52:05 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-30 15:52:14 +0100 |
| commit | 29396bd6699980711c1479cf89f7a18e4912182d (patch) | |
| tree | 0b71dcd38ae4794ad2936c792c5ed7a441097494 /src/leveldb/port/port_win.h | |
| parent | 72ca72e6370e4fabb40510f80c00b8863322aa50 (diff) | |
| parent | fa6180188b8ab89af97860e6497716405a48bab6 (diff) | |
Merge #15270: Pull leveldb subtree
4f2e6c8b881b7ccda36233332dfd1bd231389a8e Squashed 'src/leveldb/' changes from 524b7e36a8..f545dfabff (MarcoFalke)
Pull request description:
Some windows-related fixes.
Sanity check with:
```
git fetch https://github.com/bitcoin-core/leveldb
./test/lint/git-subtree-check.sh src/leveldb
Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4
Diffstat (limited to 'src/leveldb/port/port_win.h')
| -rw-r--r-- | src/leveldb/port/port_win.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/leveldb/port/port_win.h b/src/leveldb/port/port_win.h index e8bf46ef27..989c15cd91 100644 --- a/src/leveldb/port/port_win.h +++ b/src/leveldb/port/port_win.h @@ -32,9 +32,16 @@ #define STORAGE_LEVELDB_PORT_PORT_WIN_H_ #ifdef _MSC_VER +#if !(_MSC_VER >= 1900) #define snprintf _snprintf +#endif #define close _close #define fread_unlocked _fread_nolock +#ifdef _WIN64 +#define ssize_t int64_t +#else +#define ssize_t int32_t +#endif #endif #include <string> |