From: Roger Dingledine <arma@torproject.org>
Date: Sun, 11 Oct 2009 21:23:47 +0000 (-0400)
Subject: fix compile on windows
X-Git-Tag: tor-0.2.2.5-alpha^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d6c79cbbbd21fe685de7cb45f98636dac2f0b36;p=thirdparty%2Ftor.git

fix compile on windows
---

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