mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-25 02:33:24 -03:00
refactor: don't avoid sys/types.h on when building for Windows
We've already used it unguarded in `httpserver.cpp` for years, with no build issues.
This commit is contained in:
parent
369d4c03b7
commit
54e4061189
4 changed files with 13 additions and 12 deletions
|
@ -62,15 +62,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
|
||||||
|
|
|
@ -24,11 +24,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>
|
||||||
|
|
|
@ -35,9 +35,11 @@
|
||||||
#include <univalue.h>
|
#include <univalue.h>
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,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 wallet {
|
namespace wallet {
|
||||||
|
|
Loading…
Add table
Reference in a new issue