diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-07 20:03:32 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-07 20:03:32 +0200 |
| commit | 4e35a70613a5b5c0a051efb59a52a28048add092 (patch) | |
| tree | c80b037b9b74dd9c1b72aa109fe6f6d328c28447 /regex_internal.h | |
| parent | 294d1ffbc998de4c13518cc899c019998f51bd23 (diff) | |
| parent | cb4dfe29b4d374925d3bb9aed48cadf8070afc92 (diff) | |
| download | egawk-4e35a70613a5b5c0a051efb59a52a28048add092.tar.gz egawk-4e35a70613a5b5c0a051efb59a52a28048add092.tar.bz2 egawk-4e35a70613a5b5c0a051efb59a52a28048add092.zip | |
Merge branch 'master' into wasted-byte
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 |