diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-08 19:55:45 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-08 19:55:45 +0200 |
| commit | 0e38201f5879cc91c90876b2b9b219a308e3a2d2 (patch) | |
| tree | 04d4d2b948f2393d0c78433224d6affc9f724652 /regex_internal.h | |
| parent | 34c33ee0f9d3863f9ef381e499e396c9f447a941 (diff) | |
| parent | 7306300f662a4fd4adc28e60db6aa0201ec1f5b2 (diff) | |
| download | egawk-0e38201f5879cc91c90876b2b9b219a308e3a2d2.tar.gz egawk-0e38201f5879cc91c90876b2b9b219a308e3a2d2.tar.bz2 egawk-0e38201f5879cc91c90876b2b9b219a308e3a2d2.zip | |
Merge branch 'master' into non-fatal-io-2
Diffstat (limited to 'regex_internal.h')
| -rw-r--r-- | regex_internal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/regex_internal.h b/regex_internal.h index 3fc2fc58..9aab5e52 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -79,7 +79,6 @@ is_blank (int c) # ifndef _RE_DEFINE_LOCALE_FUNCTIONS # define _RE_DEFINE_LOCALE_FUNCTIONS 1 # include <locale/localeinfo.h> -# include <locale/elem-hash.h> # include <locale/coll-lookup.h> # endif #endif @@ -792,7 +791,7 @@ re_string_elem_size_at (const re_string_t *pstr, int idx) indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); p = pstr->mbs + idx; - findidx (&p, pstr->len - idx); + findidx (table, indirect, extra, &p, pstr->len - idx); return p - pstr->mbs - idx; } else |