* Merge in cygwin-64bit-branch.
This commit is contained in:
@@ -160,7 +160,7 @@ matcher(struct re_guts *g,
|
||||
int i;
|
||||
struct match mv;
|
||||
struct match *m = &mv;
|
||||
const char *dp;
|
||||
const char *dp = NULL;
|
||||
const sopno gf = g->firststate+1; /* +1 for OEND */
|
||||
const sopno gl = g->laststate;
|
||||
const char *start;
|
||||
@@ -391,7 +391,7 @@ dissect(struct match *m,
|
||||
const char *ssp; /* start of string matched by subsubRE */
|
||||
const char *sep; /* end of string matched by subsubRE */
|
||||
const char *oldssp; /* previous ssp */
|
||||
const char *dp;
|
||||
const char *dp __attribute__ ((unused));
|
||||
|
||||
AT("diss", start, stop, startst, stopst);
|
||||
sp = start;
|
||||
|
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.36 2007/06/11 03:05:54 delp
|
||||
#include "cname.h"
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
/* Don't pull in windows headers just for LCID. */
|
||||
typedef unsigned long LCID;
|
||||
/* These are defined in nlsfuncs.cc. */
|
||||
extern LCID collate_lcid;
|
||||
extern char collate_charset[];
|
||||
@@ -1477,8 +1475,8 @@ static void
|
||||
findmust(struct parse *p, struct re_guts *g)
|
||||
{
|
||||
sop *scan;
|
||||
sop *start;
|
||||
sop *newstart;
|
||||
sop *start = NULL;
|
||||
sop *newstart = NULL;
|
||||
sopno newlen;
|
||||
sop s;
|
||||
char *cp;
|
||||
|
Reference in New Issue
Block a user