From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 10 Jun 2010 14:57:33 +0000 (+0000)
Subject: In yarrow.c, undefine k5-trace.h's TRACE before defining it to avoid a
X-Git-Tag: krb5-1.9-beta1~195
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76213ff56c055ae4dbf9611905ce4c98a4fd1082;p=krb5.git

In yarrow.c, undefine k5-trace.h's TRACE before defining it to avoid a
conflict.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24126 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/crypto/krb/yarrow/yarrow.c b/src/lib/crypto/krb/yarrow/yarrow.c
index 0695cd326..2eacd936b 100644
--- a/src/lib/crypto/krb/yarrow/yarrow.c
+++ b/src/lib/crypto/krb/yarrow/yarrow.c
@@ -43,6 +43,7 @@
 #   include <stdio.h>
 #endif
 
+#undef TRACE
 #if defined( YARROW_TRACE )
 extern int yarrow_verbose;
 #define TRACE( x ) do { if (yarrow_verbose) { x } } while (0)