merge bitcoin#26832: move (win) S_* defines into bdb

This commit is contained in:
Kittywhiskers Van Gogh 2023-01-24 12:18:08 +00:00
parent db676a7e5f
commit a497df0339
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 13 additions and 12 deletions

View File

@ -63,15 +63,6 @@ typedef unsigned int SOCKET;
#endif #endif
#endif #endif
// Windows doesn't define S_IRUSR or S_IWUSR. We define both
// here, with the same values as glibc (see stat.h).
#ifdef WIN32
#ifndef S_IRUSR
#define S_IRUSR 0400
#define S_IWUSR 0200
#endif
#endif
// Windows defines MAX_PATH as it's maximum path length. // Windows defines MAX_PATH as it's maximum path length.
// We define MAX_PATH for use on non-Windows systems. // We define MAX_PATH for use on non-Windows systems.
#ifndef WIN32 #ifndef WIN32

View File

@ -25,11 +25,12 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <sys/types.h> // must go before a number of other headers
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#include <winreg.h> #include <winreg.h>
#else #else
#include <sys/types.h> // must go before a number of other headers
#include <fcntl.h> #include <fcntl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/resource.h> #include <sys/resource.h>

View File

@ -37,9 +37,11 @@
#include <unordered_set> #include <unordered_set>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <sys/types.h>
#ifndef WIN32 #ifndef WIN32
#include <signal.h> #include <signal.h>
#include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif

View File

@ -13,8 +13,15 @@
#include <stdint.h> #include <stdint.h>
#ifndef WIN32
#include <sys/stat.h> #include <sys/stat.h>
// Windows may not define S_IRUSR or S_IWUSR. We define both
// here, with the same values as glibc (see stat.h).
#ifdef WIN32
#ifndef S_IRUSR
#define S_IRUSR 0400
#define S_IWUSR 0200
#endif
#endif #endif
namespace { namespace {