diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-24 02:51:45 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-24 02:51:45 +0000 |
| commit | d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c (patch) | |
| tree | 6f5cb1fa2fc62027df2614e8f8498f3eea8bc465 /libc/misc/regex/regexec.c | |
| parent | e116018ce23fc3dcee95c2c23f9f4f7b54acd92e (diff) | |
| download | uClibc-alpine-d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c.tar.bz2 uClibc-alpine-d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c.tar.xz | |
Merge from trunk and bring in NPTL code in the various 'misc' subsystems.
Diffstat (limited to 'libc/misc/regex/regexec.c')
| -rw-r--r-- | libc/misc/regex/regexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/misc/regex/regexec.c b/libc/misc/regex/regexec.c index c56fb9d4a..2c8917e19 100644 --- a/libc/misc/regex/regexec.c +++ b/libc/misc/regex/regexec.c @@ -274,7 +274,7 @@ __compat_regexec (const regex_t *__restrict preg, } compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0); # endif -#elif __UCLIBC__ +#elif defined __UCLIBC__ strong_alias(__regexec,regexec) #endif @@ -385,7 +385,7 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, if (BE (s == NULL, 0)) return -2; -#if defined _LIBC || defined __UCLIBC__ +#if (defined _LIBC || defined __UCLIBC__) && defined __USE_GNU memcpy (__mempcpy (s, string1, length1), string2, length2); #else memcpy (s, string1, length1); |