[or-cvs] [tor/master] fix compile on windows

arma at seul.org arma at seul.org
Sun Oct 11 21:24:06 UTC 2009


Author: Roger Dingledine <arma at torproject.org>
Date: Sun, 11 Oct 2009 17:23:47 -0400
Subject: fix compile on windows
Commit: 9d6c79cbbbd21fe685de7cb45f98636dac2f0b36

---
 src/or/circuitbuild.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index fbdbb85..40c3a6b 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
-- 
1.5.6.5



More information about the tor-commits mailing list