diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-20 00:34:21 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-20 00:34:21 +0000 |
| commit | d2dfc5de011fb525161b85a1408f716a2ea358cc (patch) | |
| tree | 22804aa59f348ac9d5bf432d2ddeb4c79ad31910 /iconv/gconv_int.h | |
| parent | d620426811688301eb1cbe6e63773d6430b2706e (diff) | |
| download | glibc-d2dfc5de011fb525161b85a1408f716a2ea358cc.zip glibc-d2dfc5de011fb525161b85a1408f716a2ea358cc.tar.gz glibc-d2dfc5de011fb525161b85a1408f716a2ea358cc.tar.bz2 | |
Update.
* iconv/gconv_int.h (strict gconv_module): Remove all members
associated with regular expressions. Use a simple string as the
from name.
* iconv/gconv_db.c: Remove code handling regular expressions.
* iconv/gconv_conf.c: Likewise.
* iconv/iconv_prog.c: Likewise.
* iconv/gconv_builtin.h: Adjust for change in gconv_conf.c.
Diffstat (limited to 'iconv/gconv_int.h')
| -rw-r--r-- | iconv/gconv_int.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 6d19971..44d4d36 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -21,7 +21,6 @@ #define _GCONV_INT_H 1 #include "gconv.h" -#include <regex.h> __BEGIN_DECLS @@ -76,12 +75,7 @@ struct __gconv_loaded_object /* Description for an available conversion module. */ struct gconv_module { - const char *from_pattern; - const char *from_constpfx; - size_t from_constpfx_len; - const regex_t *from_regex; - regex_t from_regex_mem; - + const char *from_string; const char *to_string; int cost_hi; @@ -91,7 +85,6 @@ struct gconv_module struct gconv_module *left; /* Prefix smaller. */ struct gconv_module *same; /* List of entries with identical prefix. */ - struct gconv_module *matching;/* Next node with more specific prefix. */ struct gconv_module *right; /* Prefix larger. */ }; |