diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-24 15:16:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-24 15:16:49 -0400 |
| commit | 9e80fc817198a982ba92484e6e5f1932391e8412 (patch) | |
| tree | e48c50bb94c749744c3b0cef11229d1df4ec2baf /src/or | |
| parent | 25c3ff4500f912f3a9d19003bc6dab9cf6f00312 (diff) | |
| parent | 1a50cb88e684638b8b1fd066ac1ffbc7e8898a5e (diff) | |
| download | tor-9e80fc817198a982ba92484e6e5f1932391e8412.tar.gz tor-9e80fc817198a982ba92484e6e5f1932391e8412.zip | |
Merge remote-tracking branch 'sebastian/coverage_builds'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 2 | ||||
| -rw-r--r-- | src/or/include.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index dcf716f2fa..369df67363 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1407,7 +1407,7 @@ static int connection_handle_listener_read(connection_t *conn, int new_type) { tor_socket_t news; /* the new socket */ - connection_t *newconn; + connection_t *newconn = 0; /* information about the remote peer when connecting to other routers */ struct sockaddr_storage addrbuf; struct sockaddr *remote = (struct sockaddr*)&addrbuf; diff --git a/src/or/include.am b/src/or/include.am index 92980932d1..c7f22abc8d 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -99,7 +99,7 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" -src_or_libtor_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. @@ -116,7 +116,7 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \ if COVERAGE_ENABLED src_or_tor_cov_SOURCES = src/or/tor_main.c -src_or_tor_cov_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ |