File tree Expand file tree Collapse file tree 4 files changed +13
-12
lines changed Expand file tree Collapse file tree 4 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -62,15 +62,6 @@ typedef unsigned int SOCKET;
62
62
#endif
63
63
#endif
64
64
65
- // Windows doesn't define S_IRUSR or S_IWUSR. We define both
66
- // here, with the same values as glibc (see stat.h).
67
- #ifdef WIN32
68
- #ifndef S_IRUSR
69
- #define S_IRUSR 0400
70
- #define S_IWUSR 0200
71
- #endif
72
- #endif
73
-
74
65
// Windows defines MAX_PATH as it's maximum path length.
75
66
// We define MAX_PATH for use on non-Windows systems.
76
67
#ifndef WIN32
Original file line number Diff line number Diff line change 24
24
#include < thread>
25
25
#include < vector>
26
26
27
+ #include < sys/types.h> // must go before a number of other headers
28
+
27
29
#ifdef WIN32
28
30
#include < windows.h>
29
31
#include < winreg.h>
30
32
#else
31
- #include < sys/types.h> // must go before a number of other headers
32
33
#include < fcntl.h>
33
34
#include < netinet/in.h>
34
35
#include < sys/resource.h>
Original file line number Diff line number Diff line change 35
35
#include < univalue.h>
36
36
#include < utility>
37
37
#include < vector>
38
+
39
+ #include < sys/types.h>
40
+
38
41
#ifndef WIN32
39
42
#include < signal.h>
40
- #include < sys/types.h>
41
43
#include < sys/wait.h>
42
44
#endif
43
45
Original file line number Diff line number Diff line change 15
15
16
16
#include < stdint.h>
17
17
18
- #ifndef WIN32
19
18
#include < sys/stat.h>
19
+
20
+ // Windows may not define S_IRUSR or S_IWUSR. We define both
21
+ // here, with the same values as glibc (see stat.h).
22
+ #ifdef WIN32
23
+ #ifndef S_IRUSR
24
+ #define S_IRUSR 0400
25
+ #define S_IWUSR 0200
26
+ #endif
20
27
#endif
21
28
22
29
namespace wallet {
You can’t perform that action at this time.
0 commit comments