* 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.
This commit is contained in:
Corinna Vinschen
2012-02-13 13:12:37 +00:00
parent e633eaec08
commit d7bcd2a16f
8 changed files with 167 additions and 121 deletions

View File

@ -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);