aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-27 17:54:38 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-27 17:54:38 +0000
commita1620a4c559b148324f98cc959c481ece926f4a5 (patch)
treeb100aa4ae1b1dbd040437ba80d320ac2beaf2cab /iconv
parentb91d5eda6e894ca12c4971dbcfb69f02abd42800 (diff)
downloadglibc-a1620a4c559b148324f98cc959c481ece926f4a5.zip
glibc-a1620a4c559b148324f98cc959c481ece926f4a5.tar.gz
glibc-a1620a4c559b148324f98cc959c481ece926f4a5.tar.bz2
Update.
2000-11-27 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_info): Define __data element using __flexarr. * misc/sys/cdefs.h: Define __flexarr. Proposed by Joseph S. Myers <jsm28@cam.ac.uk>. * iconvdata/iso-2022-jp.c: Add prototypes to avoid warnings. * iconv/skeleton.c: Likewise. * iconvdata/iso8859-1.c (BODY to 8859-1): Add const to cast. * iconv/loop.c (get16): Add const to cast. (get32): Likewise.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv.h2
-rw-r--r--iconv/skeleton.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/iconv/gconv.h b/iconv/gconv.h
index 03574d8..3956752 100644
--- a/iconv/gconv.h
+++ b/iconv/gconv.h
@@ -168,7 +168,7 @@ typedef struct __gconv_info
{
size_t __nsteps;
struct __gconv_step *__steps;
- __extension__ struct __gconv_step_data __data[0];
+ __extension__ struct __gconv_step_data __data __flexarr;
} *__gconv_t;
#endif /* gconv.h */
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 58f3812..06e3730 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -213,6 +213,7 @@ static int to_object;
# error "CHARSET_NAME not defined"
# endif
+extern int gconv_init (struct __gconv_step *step);
int
gconv_init (struct __gconv_step *step)
{
@@ -273,6 +274,12 @@ gconv_init (struct __gconv_step *step)
#define SINGLE2(fct) fct##_single
+extern int FUNCTION_NAME (struct __gconv_step *step,
+ struct __gconv_step_data *data,
+ const unsigned char **inptrp,
+ const unsigned char *inend,
+ unsigned char **outbufstart, size_t *irreversible,
+ int do_flush, int consume_incomplete);
int
FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
const unsigned char **inptrp, const unsigned char *inend,