aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-04-25 15:28:58 -0400
committerNick Mathewson <nickm@torproject.org>2016-04-25 15:28:58 -0400
commitbff53aabce531d7786a7ce2d4dee818770d8d0cd (patch)
tree50862e68aac0ea92beddd291a0606a61044dcfc3 /src/or
parent26db1b65b92270953a6fa9e79697773fe2b73235 (diff)
downloadtor-bff53aabce531d7786a7ce2d4dee818770d8d0cd.tar.gz
tor-bff53aabce531d7786a7ce2d4dee818770d8d0cd.zip
Remove redundant declarations of MIN
Apparently somewhere along the line we decided that MIN might be missing. But we already defined it (if it was missing) in compat.h, which everybody includes. Closes ticket 18889.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuitbuild.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a5a933e6b0..e6fe3f0c37 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -47,10 +47,6 @@
#include "routerset.h"
#include "crypto.h"
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
static channel_t * channel_connect_for_circuit(const tor_addr_t *addr,
uint16_t port,
const char *id_digest);