diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-05 09:33:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-05 09:33:35 -0400 |
| commit | 60213a3621c5fa354fd7b3f3feb1a2a336d5c9ce (patch) | |
| tree | 18ac4ae7f6e06b1b52d66175dc449ad08d5c68aa /src/lib/cc | |
| parent | d1b02456c107256ee562b36b0ef2f5544eb27cee (diff) | |
| download | tor-60213a3621c5fa354fd7b3f3feb1a2a336d5c9ce.tar.gz tor-60213a3621c5fa354fd7b3f3feb1a2a336d5c9ce.zip | |
Run "make autostyle."
Diffstat (limited to 'src/lib/cc')
| -rw-r--r-- | src/lib/cc/compat_compiler.h | 2 | ||||
| -rw-r--r-- | src/lib/cc/ctassert.h | 6 | ||||
| -rw-r--r-- | src/lib/cc/torint.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index 18b76cc1a1..a8d1593214 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -229,4 +229,4 @@ #define EAT_SEMICOLON \ struct dummy_semicolon_eater__ -#endif /* !defined(TOR_COMPAT_H) */ +#endif /* !defined(TOR_COMPAT_COMPILER_H) */ diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h index e42976360f..bedf0b83a6 100644 --- a/src/lib/cc/ctassert.h +++ b/src/lib/cc/ctassert.h @@ -22,7 +22,7 @@ /* If C11 is available, just use _Static_assert. */ #define CTASSERT(x) _Static_assert((x), #x) -#else +#else /* !(__STDC_VERSION__ >= 201112L) */ /* * If C11 is not available, expand __COUNTER__, or __INCLUDE_LEVEL__ @@ -42,12 +42,12 @@ #else /* hope it's unique enough */ #define CTASSERT(x) CTASSERT_EXPN((x), l, __LINE__) -#endif +#endif /* defined(__COUNTER__) || ... */ #define CTASSERT_EXPN(x, a, b) CTASSERT_DECL(x, a, b) #define CTASSERT_DECL(x, a, b) \ typedef char tor_ctassert_##a##_##b[(x) ? 1 : -1] ATTR_UNUSED -#endif +#endif /* __STDC_VERSION__ >= 201112L */ #endif /* !defined(TOR_CTASSERT_H) */ diff --git a/src/lib/cc/torint.h b/src/lib/cc/torint.h index 9a66aada18..523f378ed7 100644 --- a/src/lib/cc/torint.h +++ b/src/lib/cc/torint.h @@ -96,9 +96,9 @@ typedef int32_t ssize_t; # else # define TOR_PRIuSZ PRIu32 # endif -#else +#else /* !(defined(_WIN32)) */ # define TOR_PRIuSZ "zu" -#endif +#endif /* defined(_WIN32) */ #ifdef _WIN32 # ifdef _WIN64 @@ -106,9 +106,9 @@ typedef int32_t ssize_t; # else # define TOR_PRIdSZ PRId32 # endif -#else +#else /* !(defined(_WIN32)) */ # define TOR_PRIdSZ "zd" -#endif +#endif /* defined(_WIN32) */ #ifndef SSIZE_MAX #if (SIZEOF_SIZE_T == 4) |