[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'public/solaris_warnings_028'
commit 64521a9d355da9f21d81c8a82056e544372685b2
Merge: 77e2be0 25513ae
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Sun Sep 11 16:52:24 2016 -0400
Merge remote-tracking branch 'public/solaris_warnings_028'
src/common/address.c | 1 +
src/common/crypto.h | 2 ++
src/common/util.c | 4 ++--
src/ext/ed25519/donna/ed25519_tor.c | 2 +-
src/ext/ed25519/ref10/keypair.c | 3 ++-
src/ext/ed25519/ref10/open.c | 3 ++-
src/ext/trunnel/trunnel-impl.h | 8 ++++----
src/ext/trunnel/trunnel.c | 4 ++--
src/ext/trunnel/trunnel.h | 2 +-
src/or/circuitmux_ewma.c | 2 ++
src/test/test-child.c | 2 +-
src/test/test-memwipe.c | 1 +
src/test/test_channeltls.c | 2 ++
src/test/test_scheduler.c | 3 +--
src/test/test_status.c | 2 ++
src/trunnel/ed25519_cert.c | 6 +++---
src/trunnel/ed25519_cert.h | 2 +-
src/trunnel/link_handshake.c | 12 ++++++------
src/trunnel/link_handshake.h | 2 +-
src/trunnel/pwbox.c | 6 +++---
src/trunnel/pwbox.h | 2 +-
21 files changed, 41 insertions(+), 30 deletions(-)
diff --cc src/test/test_scheduler.c
index 2e0736f,db331cb..05ea8e8
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@@ -1,11 -1,16 +1,10 @@@
/* Copyright (c) 2014-2016, The Tor Project, Inc. */
/* See LICENSE for licensing information */
- #include <math.h>
-
#include "orconfig.h"
+ #include <math.h>
-
-/* Libevent stuff */
-#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>
-#else
-#include <event.h>
-#endif
#define TOR_CHANNEL_INTERNAL_
#define CHANNEL_PRIVATE_
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits