diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-28 13:24:24 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-28 13:24:24 +0000 |
| commit | 1c86fc78246d5589bcab47e36061759e1124b96a (patch) | |
| tree | da423aabcfffd7916c0a96631498805b614f745a | |
| parent | cdbf15c730c1d374b2fe5802b32fe0db4c24643d (diff) | |
Sync w/ glibc
| -rw-r--r-- | libc/misc/regex/regcomp.c | 2 | ||||
| -rw-r--r-- | libc/misc/regex/regex_internal.c | 6 | ||||
| -rw-r--r-- | libc/misc/regex/regex_internal.h | 3 | ||||
| -rw-r--r-- | libc/misc/regex/regexec.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 8d464db2d..94e0314b5 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/libc/misc/regex/regex_internal.c b/libc/misc/regex/regex_internal.c index 3fc62d731..fa0b336e8 100644 --- a/libc/misc/regex/regex_internal.c +++ b/libc/misc/regex/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -259,7 +259,7 @@ build_wcs_buffer (re_string_t *pstr) /* Build wide character buffer PSTR->WCS like build_wcs_buffer, but for REG_ICASE. */ -static int +static reg_errcode_t internal_function build_wcs_upper_buffer (re_string_t *pstr) { @@ -721,7 +721,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) { if (pstr->icase) { - int ret = build_wcs_upper_buffer (pstr); + reg_errcode_t ret = build_wcs_upper_buffer (pstr); if (BE (ret != REG_NOERROR, 0)) return ret; } diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h index d82cf6d42..a0dd28247 100644 --- a/libc/misc/regex/regex_internal.h +++ b/libc/misc/regex/regex_internal.h @@ -43,6 +43,9 @@ libc_hidden_proto(nl_langinfo) #if defined HAVE_STDBOOL_H || defined _LIBC # include <stdbool.h> #endif /* HAVE_STDBOOL_H || _LIBC */ +#if defined HAVE_STDINT_H || defined _LIBC +# include <stdint.h> +#endif /* HAVE_STDINT_H || _LIBC */ #if defined _LIBC # include <bits/libc-lock.h> #else diff --git a/libc/misc/regex/regexec.c b/libc/misc/regex/regexec.c index c56fb9d4a..bafc34ce0 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 |