From d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Thu, 24 Aug 2006 02:51:45 +0000 Subject: Merge from trunk and bring in NPTL code in the various 'misc' subsystems. --- libc/misc/regex/regex_internal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libc/misc/regex/regex_internal.c') 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 . @@ -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; } -- cgit v1.2.3