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

[Gabor Kovesdan]

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"