Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Aug 2011 18:04:42 +0000 (UTC)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r224895 - user/gabor/tre-integration/contrib/tre/lib
Message-ID:  <201108151804.p7FI4gIJ021064@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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. */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108151804.p7FI4gIJ021064>