Index: dkim-canon.c
===================================================================
RCS file: /cvsroot/opendkim/libopendkim/dkim-canon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libopendkim/dkim-canon.c	7 Oct 2009 01:00:59 -0000	1.10
+++ libopendkim/dkim-canon.c	20 Oct 2009 18:35:51 -0000	1.11
@@ -6,7 +6,7 @@
 */
 
 #ifndef lint
-static char dkim_canon_c_id[] = "@(#)$Id: dkim-canon.c,v 1.10 2009/10/07 01:00:59 cm-msk Exp $";
+static char dkim_canon_c_id[] = "@(#)$Id: dkim-canon.c,v 1.11 2009/10/20 18:35:51 cm-msk Exp $";
 #endif /* !lint */
 
 /* system includes */
@@ -20,9 +20,11 @@
 #include <limits.h>
 #ifdef USE_TRE
 # include <tre/tre.h>
-# define regcomp	tre_regcomp
-# define regexec	tre_regexec
-# define regfree	tre_regfree
+# ifndef TRE_USE_SYSTEM_REGEX_H
+#  define regcomp	tre_regcomp
+#  define regexec	tre_regexec
+#  define regfree	tre_regfree
+# endif /* TRE_USE_SYSTEM_REGEX_H */
 #else /* USE_TRE */
 # include <regex.h>
 #endif /* USE_TRE */
Index: dkim.c
===================================================================
RCS file: /cvsroot/opendkim/libopendkim/dkim.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libopendkim/dkim.c	7 Oct 2009 01:01:00 -0000	1.16
+++ libopendkim/dkim.c	20 Oct 2009 18:35:51 -0000	1.17
@@ -6,7 +6,7 @@
 */
 
 #ifndef lint
-static char dkim_c_id[] = "@(#)$Id: dkim.c,v 1.16 2009/10/07 01:01:00 cm-msk Exp $";
+static char dkim_c_id[] = "@(#)$Id: dkim.c,v 1.17 2009/10/20 18:35:51 cm-msk Exp $";
 #endif /* !lint */
 
 /* system includes */
@@ -27,10 +27,12 @@
 #include <resolv.h>
 #ifdef USE_TRE
 # include <tre/tre.h>
-# define regcomp	tre_regcomp
-# define regexec	tre_regexec
-# define regfree	tre_regfree
-# define regerror	tre_regerror
+# ifndef TRE_USE_SYSTEM_REGEX_H
+#  define regcomp	tre_regcomp
+#  define regexec	tre_regexec
+#  define regfree	tre_regfree
+#  define regerror	tre_regerror
+# endif /* TRE_USE_SYSTEM_REGEX_H */
 #else /* USE_TRE */
 # include <regex.h>
 #endif /* USE_TRE */