From 0697cdc3950e52cd6900ae6a52a46d2fa63973a1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Aug 1999 20:09:32 +0000
Subject: Update.

	* sysdeps/generic/_G_config.h: Update _G_iconv_t type from Linux
	version.
---
 sysdeps/generic/_G_config.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index 04bc4ed644..dab0bd4a7e 100644
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -40,10 +40,14 @@ typedef struct
 #define _G_wint_t	wint_t
 #define _G_stat64	stat
 #include <gconv.h>
-typedef struct
+typedef union
 {
-  __gconv_t __cd;
-  struct __gconv_step_data __data;
+  struct __gconv_info __cd;
+  struct
+  {
+    struct __gconv_info __cd;
+    struct __gconv_step_data __data;
+  } __combined;
 } _G_iconv_t;
 
 typedef int _G_int16_t __attribute__ ((__mode__ (__HI__)));
-- 
cgit 1.4.1