svn commit: r224992 - user/gabor/tre-integration/contrib/tre/lib

[Gabor Kovesdan]

Author: gabor
Date: Fri Aug 19 02:03:00 2011
New Revision: 224992
URL: http://svn.freebsd.org/changeset/base/224992

Log:
  - Move TRE_CHAR macro to tre-internal.h because it will be used in the
    heuristic code

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

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c	Fri Aug 19 01:11:06 2011	(r224991)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c	Fri Aug 19 02:03:00 2011	(r224992)
@@ -48,15 +48,6 @@ static int	fastcmp(const void *, const v
 			tre_str_type_t, bool, bool);
 
 /*
- * We will work with wide characters if they are supported
- */
-#ifdef TRE_WCHAR
-#define TRE_CHAR(n)	L##n
-#else
-#define TRE_CHAR(n)	n
-#endif
-
-/*
  * Skips n characters in the input string and assigns the start
  * address to startptr. Note: as per IEEE Std 1003.1-2008
  * matching is based on bit pattern not character representations

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-internal.h
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-internal.h	Fri Aug 19 01:11:06 2011	(r224991)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-internal.h	Fri Aug 19 02:03:00 2011	(r224992)
@@ -47,6 +47,9 @@
 /* Define the character types and functions. */
 #ifdef TRE_WCHAR
 
+/* Use wide character constants */
+#define TRE_CHAR(n) L##n
+
 /* Wide characters. */
 typedef wint_t tre_cint_t;
 #define TRE_CHAR_MAX WCHAR_MAX
@@ -78,6 +81,9 @@ typedef wint_t tre_cint_t;
 
 #else /* !TRE_WCHAR */
 
+/* Use single-byte character constants */
+#define TRE_CHAR(n) n
+
 /* 8 bit characters. */
 typedef short tre_cint_t;
 #define TRE_CHAR_MAX 255