In yarrow.c, undefine k5-trace.h's TRACE before defining it to avoid a
authorGreg Hudson <ghudson@mit.edu>
Thu, 10 Jun 2010 14:57:33 +0000 (14:57 +0000)
committerGreg Hudson <ghudson@mit.edu>
Thu, 10 Jun 2010 14:57:33 +0000 (14:57 +0000)
conflict.

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

src/lib/crypto/krb/yarrow/yarrow.c

index 0695cd326a0b6e5bf03b0a142e2fabc9394acc78..2eacd936b1877e11267894f005ef635828d9b0b7 100644 (file)
@@ -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)