diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-21 14:07:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-21 14:07:43 -0500 |
| commit | bf882b037371d5ccb9eb1fc6c71199865169661b (patch) | |
| tree | 39c2de688fc53f5af24ef89b425e8b7cbfd98461 /src/common | |
| parent | 5da0a73838a210bac3be81baa9ade1d4ee7bf343 (diff) | |
| download | tor-bf882b037371d5ccb9eb1fc6c71199865169661b.tar.gz tor-bf882b037371d5ccb9eb1fc6c71199865169661b.zip | |
re-run ./scripts/maint/annotate_ifdef_directives
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat_threads.c | 2 | ||||
| -rw-r--r-- | src/common/compat_threads.h | 8 | ||||
| -rw-r--r-- | src/common/sandbox.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index e8a97f1254..6adcaab956 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -403,5 +403,5 @@ atomic_counter_exchange(atomic_counter_t *counter, size_t newval) tor_mutex_release(&counter->mutex); return oldval; } -#endif +#endif /* !defined(HAVE_STDATOMIC_H) */ diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index b452648ea5..ce86b15e9d 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -159,13 +159,13 @@ typedef struct atomic_counter_t { atomic_size_t val; } atomic_counter_t; #define ATOMIC_LINKAGE static -#else +#else /* !(defined(HAVE_STDATOMIC_H)) */ typedef struct atomic_counter_t { tor_mutex_t mutex; size_t val; } atomic_counter_t; #define ATOMIC_LINKAGE -#endif +#endif /* defined(HAVE_STDATOMIC_H) */ ATOMIC_LINKAGE void atomic_counter_init(atomic_counter_t *counter); ATOMIC_LINKAGE void atomic_counter_destroy(atomic_counter_t *counter); @@ -214,8 +214,8 @@ atomic_counter_exchange(atomic_counter_t *counter, size_t newval) return atomic_exchange(&counter->val, newval); } -#else -#endif +#else /* !(defined(HAVE_STDATOMIC_H)) */ +#endif /* defined(HAVE_STDATOMIC_H) */ #endif /* !defined(TOR_COMPAT_THREADS_H) */ diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 92fdd60221..aec9857e94 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -429,9 +429,9 @@ libc_uses_openat_for_everything(void) return 1; else return 0; -#else +#else /* !(defined(CHECK_LIBC_VERSION)) */ return 0; -#endif +#endif /* defined(CHECK_LIBC_VERSION) */ } /** Allow a single file to be opened. If <b>use_openat</b> is true, @@ -1126,7 +1126,7 @@ sb_kill(scmp_filter_ctx ctx, sandbox_cfg_t *filter) SCMP_CMP(1, SCMP_CMP_EQ, 0)); #else return 0; -#endif +#endif /* defined(__NR_kill) */ } /** |