diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-03-11 10:35:46 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-03-11 10:35:46 -0400 |
commit | 55055396ccfb4878772a3bc8360bc3dd56d09c64 (patch) | |
tree | 284b214407b1d7d823f2ae4d1ce88c3e70dfc485 /src/lib/trace | |
parent | 5721ec22d8be99a6f24fa69d51d0cbdc4ff21739 (diff) | |
parent | 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (diff) | |
download | tor-55055396ccfb4878772a3bc8360bc3dd56d09c64.tar.gz tor-55055396ccfb4878772a3bc8360bc3dd56d09c64.zip |
Merge branch 'maint-0.4.1' into bug33032_041
Diffstat (limited to 'src/lib/trace')
-rw-r--r-- | src/lib/trace/debug.h | 2 | ||||
-rw-r--r-- | src/lib/trace/events.h | 6 | ||||
-rw-r--r-- | src/lib/trace/include.am | 3 | ||||
-rw-r--r-- | src/lib/trace/trace.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/trace/debug.h b/src/lib/trace/debug.h index e35616cf50..92bb95c883 100644 --- a/src/lib/trace/debug.h +++ b/src/lib/trace/debug.h @@ -27,4 +27,4 @@ "\"" XSTR(subsystem) "\" hit. " \ "(line "XSTR(__LINE__) ")") -#endif /* TOR_TRACE_LOG_DEBUG_H */ +#endif /* !defined(TOR_TRACE_LOG_DEBUG_H) */ diff --git a/src/lib/trace/events.h b/src/lib/trace/events.h index 1e1e7b9d16..0674f7d501 100644 --- a/src/lib/trace/events.h +++ b/src/lib/trace/events.h @@ -34,12 +34,12 @@ #include "lib/trace/debug.h" #endif -#else /* TOR_EVENT_TRACING_ENABLED */ +#else /* !(defined(TOR_EVENT_TRACING_ENABLED)) */ /* Reaching this point, we NOP every event declaration because event tracing * is not been enabled at compile time. */ #define tor_trace(subsystem, name, args...) -#endif /* TOR_EVENT_TRACING_ENABLED */ +#endif /* defined(TOR_EVENT_TRACING_ENABLED) */ -#endif /* TOR_TRACE_EVENTS_H */ +#endif /* !defined(TOR_TRACE_EVENTS_H) */ diff --git a/src/lib/trace/include.am b/src/lib/trace/include.am index 6f10c98744..98098c87f4 100644 --- a/src/lib/trace/include.am +++ b/src/lib/trace/include.am @@ -2,6 +2,7 @@ noinst_LIBRARIES += \ src/lib/libtor-trace.a +# ADD_C_FILE: INSERT HEADERS HERE. TRACEHEADERS = \ src/lib/trace/trace.h \ src/lib/trace/events.h @@ -11,7 +12,7 @@ TRACEHEADERS += \ src/lib/trace/debug.h endif -# Library source files. +# ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_trace_a_SOURCES = \ src/lib/trace/trace.c diff --git a/src/lib/trace/trace.h b/src/lib/trace/trace.h index 606d435568..5001b28a1d 100644 --- a/src/lib/trace/trace.h +++ b/src/lib/trace/trace.h @@ -11,4 +11,4 @@ void tor_trace_init(void); -#endif // TOR_TRACE_TRACE_H +#endif /* !defined(TOR_TRACE_TRACE_H) */ |