From e1e595a649d55a304416c1e8e23f99e0df58a452 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 4 Feb 2010 12:35:49 +0000
Subject: 	Replace regex files with multibyte-aware version from FreeBSD.
 	* Makefile.in (install-headers): Remove extra command to install 
 regex.h. 	(uninstall-headers): Remove extra command to uninstall
 regex.h. 	* nlsfuncs.cc (collate_lcid): Make externally available to
 allow 	access to collation internals from regex functions. 
 (collate_charset): Ditto. 	* wchar.h: Add __cplusplus guards to make
 C-clean. 	* include/regex.h: New file, replacing regex/regex.h.  Remove
 UCB 	advertising clause. 	* regex/COPYRIGHT: Accommodate BSD license. 
 Remove UCB advertising 	clause. 	* regex/cclass.h: Remove. 
 * regex/cname.h: New file from FreeBSD. 	* regex/engine.c: Ditto. 
 (NONCHAR): Tweak for Cygwin. 	* regex/engine.ih: Remove. 	* regex/mkh:
 Remove. 	* regex/regcomp.c: New file from FreeBSD.  Tweak slightly for
 Cygwin. 	Import required collate internals from nlsfunc.cc. 
 (p_ere_exp): Add GNU-specific \< and \> handling for word boundaries. 
 (p_simp_re): Ditto. 	(__collate_range_cmp): Define. 	(p_b_term): Use
 Cygwin-specific collate internals. 	(findmust): Ditto. 	*
 regex/regcomp.ih: Remove. 	* regex/regerror.c: New file from FreeBSD. 
 Fix a few compiler warnings. 	* regex/regerror.ih: Remove. 	*
 regex/regex.7: New file from FreeBSD.  Remove UCB advertising clause. 	*
 regex/regex.h: Remove.  Replaced by include/regex.h. 	* regex/regexec.c: New
 file from FreeBSD.  Fix a few compiler warnings. 	* regex/regfree.c: New
 file from FreeBSD. 	* regex/tests: Remove. 	* regex/utils.h: New file from
 FreeBSD.

---
 winsup/cygwin/regex/regex.h | 76 ---------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 winsup/cygwin/regex/regex.h

(limited to 'winsup/cygwin/regex/regex.h')

diff --git a/winsup/cygwin/regex/regex.h b/winsup/cygwin/regex/regex.h
deleted file mode 100644
index 03a182555..000000000
--- a/winsup/cygwin/regex/regex.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _REGEX_H_
-#define	_REGEX_H_	/* never again */
-#include <sys/types.h>
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regex2.h === */
-typedef _off_t regoff_t;
-typedef struct {
-	int re_magic;
-	size_t re_nsub;		/* number of parenthesized subexpressions */
-	const char *re_endp;	/* end pointer for REG_PEND */
-	struct re_guts *re_g;	/* none of your business :-) */
-} regex_t;
-typedef struct {
-	regoff_t rm_so;		/* start of match */
-	regoff_t rm_eo;		/* end of match */
-} regmatch_t;
-
-
-/* === regcomp.c === */
-extern int regcomp(regex_t *, const char *, int);
-#define	REG_BASIC	0000
-#define	REG_EXTENDED	0001
-#define	REG_ICASE	0002
-#define	REG_NOSUB	0004
-#define	REG_NEWLINE	0010
-#define	REG_NOSPEC	0020
-#define	REG_PEND	0040
-#define	REG_DUMP	0200
-
-
-/* === regerror.c === */
-#define	REG_OKAY	 0
-#define	REG_NOMATCH	 1
-#define	REG_BADPAT	 2
-#define	REG_ECOLLATE	 3
-#define	REG_ECTYPE	 4
-#define	REG_EESCAPE	 5
-#define	REG_ESUBREG	 6
-#define	REG_EBRACK	 7
-#define	REG_EPAREN	 8
-#define	REG_EBRACE	 9
-#define	REG_BADBR	10
-#define	REG_ERANGE	11
-#define	REG_ESPACE	12
-#define	REG_BADRPT	13
-#define	REG_EMPTY	14
-#define	REG_ASSERT	15
-#define	REG_INVARG	16
-#define	REG_ATOI	255	/* convert name to number (!) */
-#define	REG_ITOA	0400	/* convert number to name (!) */
-extern size_t regerror(int, const regex_t *, char *, size_t);
-
-
-/* === regexec.c === */
-extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
-#define	REG_NOTBOL	00001
-#define	REG_NOTEOL	00002
-#define	REG_STARTEND	00004
-#define	REG_TRACE	00400	/* tracing of execution */
-#define	REG_LARGE	01000	/* force large representation */
-#define	REG_BACKR	02000	/* force use of backref code */
-
-
-/* === regfree.c === */
-extern void regfree(regex_t *);
-
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-#endif
-- 
cgit v1.2.3