From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Aug 1999 20:09:32 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/pre-glibc-2_1_3~506
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0697cdc3950e52cd6900ae6a52a46d2fa63973a1;p=platform%2Fupstream%2Fglibc.git

Update.

	* sysdeps/generic/_G_config.h: Update _G_iconv_t type from Linux
	version.
---

diff --git a/ChangeLog b/ChangeLog
index b0ddc50..870b278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-13  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/generic/_G_config.h: Update _G_iconv_t type from Linux
+	version.
+
 	* po/fr.po: Update.
 
 1999-08-11  Thorsten Kukuk  <kukuk@suse.de>
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index 04bc4ed..dab0bd4 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__)));