From d2dfc5de011fb525161b85a1408f716a2ea358cc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 20 Jun 2000 00:34:21 +0000 Subject: 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. --- iconv/gconv_int.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'iconv/gconv_int.h') diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 6d199715ca..44d4d36445 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -21,7 +21,6 @@ #define _GCONV_INT_H 1 #include "gconv.h" -#include __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. */ }; -- cgit v1.2.3