diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-02-13 13:12:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-02-13 13:12:37 +0000 |
| commit | d7bcd2a16f4dfad45357c57bc6334db51652215e (patch) | |
| tree | f066a688df2d64de276da2b10d22960ea429d533 /winsup/cygwin/regex/regcomp.c | |
| parent | e633eaec087cc723ce6af440ed8b91d44a35cf79 (diff) | |
| download | cygnal-d7bcd2a16f4dfad45357c57bc6334db51652215e.tar.gz cygnal-d7bcd2a16f4dfad45357c57bc6334db51652215e.tar.bz2 cygnal-d7bcd2a16f4dfad45357c57bc6334db51652215e.zip | |
* Makefile.in (clean): Remove non-existant regexp dir.
* collate.h: New header.
(__collate_range_cmp): Declare.
(__collate_load_error): Define.
* glob.cc: Pull in latest version from FreeBSD. Simplify and reduce
Cygwin-specific changes.
* regex/regcomp.c: Include collate.h on Cygwin as well.
(__collate_range_cmp): Move from here...
* nlsfuncs.cc (__collate_range_cmp): ...to here.
* miscfuncs.cc (thread_wrapper): Fix typo in comment.
(CygwinCreateThread): Take dead zone of Windows stack into account.
Change the way how the stack is commited and how to handle guardpages.
Explain how and why.
* thread.h (PTHREAD_DEFAULT_STACKSIZE): Change definition. Explain why.
Diffstat (limited to 'winsup/cygwin/regex/regcomp.c')
| -rw-r--r-- | winsup/cygwin/regex/regcomp.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index 5aee63948..30502f7f1 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -55,9 +55,7 @@ __FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.36 2007/06/11 03:05:54 delp #include <wchar.h> #include <wctype.h> -#ifndef __CYGWIN__ #include "collate.h" -#endif #include "utils.h" #include "regex2.h" @@ -771,17 +769,6 @@ p_bracket(struct parse *p) EMIT(OANYOF, (int)(cs - p->g->sets)); } -#ifdef __CYGWIN__ -/* This function is usually part of FreeBSD's libc. */ -int -__collate_range_cmp(int c1, int c2) -{ - char s1[2] = { c1, '\0' }; - char s2[2] = { c2, '\0' }; - return strcoll (s1, s2); -} -#endif - /* - p_b_term - parse one term of a bracketed character list == static void p_b_term(struct parse *p, cset *cs); |