summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-10-11 17:23:47 -0400
committerRoger Dingledine <arma@torproject.org>2009-10-11 17:23:47 -0400
commit9d6c79cbbbd21fe685de7cb45f98636dac2f0b36 (patch)
tree401ca040f2ee231f3a237a6dd5add7e8eb6cf47e
parent255245a2891cfa563ed7afdffe27173e3a9c840f (diff)
downloadtor-9d6c79cbbbd21fe685de7cb45f98636dac2f0b36.tar.gz
tor-9d6c79cbbbd21fe685de7cb45f98636dac2f0b36.zip
fix compile on windowstor-0.2.2.5-alpha
-rw-r--r--src/or/circuitbuild.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index fbdbb85b2f..40c3a6b87f 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -14,6 +14,10 @@
#include "or.h"
#include "crypto.h"
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+
/*
* This madness is needed because if we simply #undef log
* before including or.h or log.h, we get linker collisions