diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 16:15:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 16:24:21 -0400 |
| commit | 7a597718bb9cda3dd553c2b12fd42f04ead44c85 (patch) | |
| tree | 4f469c213ce1a688c8bf4c8f6874823117e705f9 /src/common/compat.h | |
| parent | 40ce9819dd7c589f624715c9c800cff714140a70 (diff) | |
| download | tor-7a597718bb9cda3dd553c2b12fd42f04ead44c85.tar.gz tor-7a597718bb9cda3dd553c2b12fd42f04ead44c85.zip | |
Split some long #if lines to make the #endif annotator happy
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 473ad2b957..0b0c75bc59 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -281,7 +281,11 @@ size_t strlcpy(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); #define I64_LITERAL(n) (n ## ll) #endif -#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) +#define MINGW_ANY +#endif + +#if defined(_MSC_VER) || defined(MINGW_ANY) /** The formatting string used to put a uint64_t value in a printf() or * scanf() function. See also U64_PRINTF_ARG and U64_SCANF_ARG. */ #define U64_FORMAT "%I64u" @@ -526,8 +530,8 @@ struct in6_addr /** @{ */ /** Many BSD variants seem not to define these. */ -#if defined(__APPLE__) || defined(__darwin__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__APPLE__) || defined(__darwin__) || \ + defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #ifndef s6_addr16 #define s6_addr16 __u6_addr.__u6_addr16 #endif |