diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-21 15:50:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-26 13:25:21 +0200 |
| commit | b4aa769bcb82519024ee54fc84a37c34420d53b8 (patch) | |
| tree | 9a54ee0151c53ab94e7eddfeec9e0fcabfa8fc9a /src | |
| parent | af8297c010154243cb11b27184a9badb4e03ecb0 (diff) | |
| download | bitcoin-b4aa769bcb82519024ee54fc84a37c34420d53b8.tar.xz | |
Move `S_I*` constants and `MSG_NOSIGNAL` to compat.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat.h | 14 | ||||
| -rw-r--r-- | src/util.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/compat.h b/src/compat.h index 3f0a8b6158..4fc28a36e0 100644 --- a/src/compat.h +++ b/src/compat.h @@ -59,6 +59,20 @@ typedef u_int SOCKET; #define SOCKET_ERROR -1 #endif +#ifdef WIN32 +#ifndef S_IRUSR +#define S_IRUSR 0400 +#define S_IWUSR 0200 +#endif +#else +#define MAX_PATH 1024 +#endif + +// As Solaris does not have the MSG_NOSIGNAL flag for send(2) syscall, it is defined as 0 +#if !defined(HAVE_MSG_NOSIGNAL) && !defined(MSG_NOSIGNAL) +#define MSG_NOSIGNAL 0 +#endif + #ifndef WIN32 // PRIO_MAX is not defined on Solaris #ifndef PRIO_MAX diff --git a/src/util.h b/src/util.h index 939e59c301..e0feca07ca 100644 --- a/src/util.h +++ b/src/util.h @@ -46,20 +46,6 @@ static const int64_t CENT = 1000000; // This is needed because the foreach macro can't get over the comma in pair<t1, t2> #define PAIRTYPE(t1, t2) std::pair<t1, t2> -#ifdef WIN32 -#define MSG_DONTWAIT 0 - -#ifndef S_IRUSR -#define S_IRUSR 0400 -#define S_IWUSR 0200 -#endif -#else -#define MAX_PATH 1024 -#endif -// As Solaris does not have the MSG_NOSIGNAL flag for send(2) syscall, it is defined as 0 -#if !defined(HAVE_MSG_NOSIGNAL) && !defined(MSG_NOSIGNAL) -#define MSG_NOSIGNAL 0 -#endif inline void MilliSleep(int64_t n) { |