about summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
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 03574d859e..39567524a8 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 58f381295f..06e373013d 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,