From owner-svn-src-user@FreeBSD.ORG  Mon Aug 15 18:04:42 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E850A106564A;
	Mon, 15 Aug 2011 18:04:42 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8F898FC17;
	Mon, 15 Aug 2011 18:04:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7FI4grU021066;
	Mon, 15 Aug 2011 18:04:42 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7FI4gIJ021064;
	Mon, 15 Aug 2011 18:04:42 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108151804.p7FI4gIJ021064@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 15 Aug 2011 18:04:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224895 - user/gabor/tre-integration/contrib/tre/lib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Aug 2011 18:04:43 -0000

Author: gabor
Date: Mon Aug 15 18:04:42 2011
New Revision: 224895
URL: http://svn.freebsd.org/changeset/base/224895

Log:
  - Use TRE-specific internal macro for better portability

Modified:
  user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c	Mon Aug 15 18:03:35 2011	(r224894)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c	Mon Aug 15 18:04:42 2011	(r224895)
@@ -347,7 +347,7 @@ static int	fastcmp(const void *, const v
   fg->newline = (cflags & REG_NEWLINE);					\
 									\
   /* Cannot handle REG_ICASE with MB string */				\
-  if (fg->icase && (MB_CUR_MAX > 1))					\
+  if (fg->icase && (TRE_MB_CUR_MAX > 1))				\
     return REG_BADPAT;							\
 									\
   /* Calculate length if unspecified */					\
@@ -363,7 +363,7 @@ tre_compile_literal(fastmatch_t *fg, con
   INIT_COMP;
 
   /* Cannot handle word boundaries with MB string */
-  if (fg->word && (MB_CUR_MAX > 1))
+  if (fg->word && (TRE_MB_CUR_MAX > 1))
     return REG_BADPAT;
 
 #ifdef TRE_WCHAR
@@ -419,7 +419,7 @@ tre_compile_fast(fastmatch_t *fg, const 
     }
 
   /* Cannot handle word boundaries with MB string */
-  if (fg->word && (MB_CUR_MAX > 1))
+  if (fg->word && (TRE_MB_CUR_MAX > 1))
     return REG_BADPAT;
 
   /* Look for ways to cheat...er...avoid the full regex engine. */