fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-27 21:52:02 +00:00
Code Issues Projects Releases Wiki Activity

duplicate re_nsub in LSB/glibc ABI compatible location

Browse Source
This commit is contained in:
Rich Felker
2011-06-16 16:53:11 -04:00
parent c7d19f9923
commit 32aea2087a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/regex.h
View File

@ -13,7 +13,8 @@ typedef long regoff_t;
typedef struct { typedef struct {
size_t re_nsub; size_t re_nsub;
void *__opaque; void *__opaque, *__padding[4];
size_t __nsub2;
} regex_t; } regex_t;
typedef struct { typedef struct {

2
src/regex/regcomp.c
View File

@ -3115,7 +3115,7 @@ tre_compile(regex_t *preg, const tre_char_t *regex, size_t n, int cflags)
errcode = tre_parse(&parse_ctx); errcode = tre_parse(&parse_ctx);
if (errcode != REG_OK) if (errcode != REG_OK)
ERROR_EXIT(errcode); ERROR_EXIT(errcode);
preg->re_nsub = parse_ctx.submatch_id - 1; preg->re_nsub = preg->__nsub2 = parse_ctx.submatch_id - 1;
tree = parse_ctx.result; tree = parse_ctx.result;
#ifdef TRE_DEBUG #ifdef TRE_DEBUG