aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.h
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2014-10-26 14:43:55 +1100
committerteor <teor2345@gmail.com>2014-10-30 22:34:46 +1100
commit13298d90a90dc62d21d38f910171c9b57a8f0273 (patch)
treedf91745009bef0a26901438d361036f039e9b00f /src/or/connection.h
parentacc392856d255059949bb22d2daf56c61f3fd76d (diff)
downloadtor-13298d90a90dc62d21d38f910171c9b57a8f0273.tar.gz
tor-13298d90a90dc62d21d38f910171c9b57a8f0273.zip
Silence spurious clang warnings
Silence clang warnings under --enable-expensive-hardening, including: + implicit truncation of 64 bit values to 32 bit; + const char assignment to self; + tautological compare; and + additional parentheses around equality tests. (gcc uses these to silence assignment, so clang warns when they're present in an equality test. But we need to use extra parentheses in macros to isolate them from other code).
Diffstat (limited to 'src/or/connection.h')
-rw-r--r--src/or/connection.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection.h b/src/or/connection.h
index 917a6fbe37..7cdfd3e253 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -189,7 +189,8 @@ dir_connection_t *connection_dir_get_by_purpose_and_resource(
int any_other_active_or_conns(const or_connection_t *this_conn);
-#define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR)
+/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */
+#define connection_speaks_cells(conn) (((conn)->type == CONN_TYPE_OR) || 0)
int connection_is_listener(connection_t *conn);
int connection_state_is_open(connection_t *conn);
int connection_state_is_connecting(connection_t *conn);