From owner-svn-src-user@FreeBSD.ORG  Sat Feb 18 20:27:01 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 EDB24106570D;
	Sat, 18 Feb 2012 20:27:01 +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 BFB188FC0A;
	Sat, 18 Feb 2012 20:27:01 +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 q1IKR1OM046883;
	Sat, 18 Feb 2012 20:27:01 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1IKR1eF046880;
	Sat, 18 Feb 2012 20:27:01 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201202182027.q1IKR1eF046880@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 18 Feb 2012 20:27:01 +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: r231901 - 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: Sat, 18 Feb 2012 20:27:02 -0000

Author: gabor
Date: Sat Feb 18 20:27:01 2012
New Revision: 231901
URL: http://svn.freebsd.org/changeset/base/231901

Log:
  - header cleanup

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

Modified: user/gabor/tre-integration/contrib/tre/lib/mregexec.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/mregexec.c	Sat Feb 18 20:23:22 2012	(r231900)
+++ user/gabor/tre-integration/contrib/tre/lib/mregexec.c	Sat Feb 18 20:27:01 2012	(r231901)
@@ -28,44 +28,16 @@
 #include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#ifdef TRE_USE_ALLOCA
-/* AIX requires this to be the first thing in the file.	 */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-#endif /* TRE_USE_ALLOCA */
-
-#include <assert.h>
+#include <limits.h>
+#include <mregex.h>
 #include <regex.h>
-#include <stdlib.h>
-#include <string.h>
 #ifdef HAVE_WCHAR_H
 #include <wchar.h>
 #endif /* HAVE_WCHAR_H */
-#ifdef HAVE_WCTYPE_H
-#include <wctype.h>
-#endif /* HAVE_WCTYPE_H */
-#ifndef TRE_WCHAR
-#include <ctype.h>
-#endif /* !TRE_WCHAR */
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif /* HAVE_MALLOC_H */
-#include <limits.h>
 
-#include "tre-fastmatch.h"
 #include "tre-heuristic.h"
 #include "tre-internal.h"
+#include "tre-mfastmatch.h"
 #include "xmalloc.h"
 
 #ifdef TRE_LIBC_BUILD

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c	Sat Feb 18 20:23:22 2012	(r231900)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c	Sat Feb 18 20:27:01 2012	(r231901)
@@ -29,6 +29,7 @@
 #endif /* HAVE_CONFIG_H */
 #include <mregex.h>
 #include <regex.h>
+
 #include "tre-mfastmatch.h"
 #include "xmalloc.h"