From owner-svn-src-user@FreeBSD.ORG  Wed Feb 22 21:46:16 2012
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 4D113106566C;
	Wed, 22 Feb 2012 21:46:16 +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 3CA608FC13;
	Wed, 22 Feb 2012 21:46:16 +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 q1MLkGdD070338;
	Wed, 22 Feb 2012 21:46:16 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1MLkGka070336;
	Wed, 22 Feb 2012 21:46:16 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201202222146.q1MLkGka070336@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 22 Feb 2012 21:46:16 +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: r232006 - 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: Wed, 22 Feb 2012 21:46:16 -0000

Author: gabor
Date: Wed Feb 22 21:46:15 2012
New Revision: 232006
URL: http://svn.freebsd.org/changeset/base/232006

Log:
  - Add back struct that has been removed with an old header

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

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.h
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.h	Wed Feb 22 21:45:52 2012	(r232005)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.h	Wed Feb 22 21:46:15 2012	(r232006)
@@ -1,14 +1,40 @@
 #ifndef TRE_FASTMATCH_H
 #define TRE_FASTMATCH_H 1
 
-#include <fastmatch.h>
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
+#include <wchar.h>
 
 #include "hashtable.h"
 #include "tre-internal.h"
 
+typedef struct {
+  size_t wlen;
+  size_t len;
+  wchar_t *wpattern;
+  bool *wescmap;
+  unsigned int qsBc[UCHAR_MAX + 1];
+  unsigned int *bmGs;
+  char *pattern;
+  bool *escmap;
+  unsigned int defBc;
+  void *qsBc_table;
+  unsigned int *sbmGs;
+  const char *re_endp;
+
+  /* flags */
+  bool hasdot;
+  bool bol;
+  bool eol;
+  bool word;
+  bool icase;
+  bool newline;
+  bool nosub;
+  bool matchall;
+  bool reversed;
+} fastmatch_t;
+
 int
 tre_proc_literal(fastmatch_t *, const tre_char_t *, size_t,
 		 const char *, size_t, int);