about summary refs log tree commit diff
path: root/sysdeps/generic/_G_config.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-13 20:09:32 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-13 20:09:32 +0000
commit0697cdc3950e52cd6900ae6a52a46d2fa63973a1 (patch)
treef53ed877f92e382716031eec7298457a0a23b20a /sysdeps/generic/_G_config.h
parentf9181e0e0634eb1227e55d318729a213ad2d5f87 (diff)
downloadglibc-0697cdc3950e52cd6900ae6a52a46d2fa63973a1.tar.gz
glibc-0697cdc3950e52cd6900ae6a52a46d2fa63973a1.tar.xz
glibc-0697cdc3950e52cd6900ae6a52a46d2fa63973a1.zip
Update.
	* sysdeps/generic/_G_config.h: Update _G_iconv_t type from Linux
	version.
Diffstat (limited to 'sysdeps/generic/_G_config.h')
-rw-r--r--sysdeps/generic/_G_config.h10
1 files changed, 7 insertions, 3 deletions
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__)));