diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-08-13 20:09:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-13 20:09:32 +0000 |
| commit | 0697cdc3950e52cd6900ae6a52a46d2fa63973a1 (patch) | |
| tree | f53ed877f92e382716031eec7298457a0a23b20a | |
| parent | f9181e0e0634eb1227e55d318729a213ad2d5f87 (diff) | |
| download | glibc-0697cdc3950e52cd6900ae6a52a46d2fa63973a1.tar.gz glibc-0697cdc3950e52cd6900ae6a52a46d2fa63973a1.tar.xz glibc-0697cdc3950e52cd6900ae6a52a46d2fa63973a1.zip | |
Update.
* sysdeps/generic/_G_config.h: Update _G_iconv_t type from Linux version.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/generic/_G_config.h | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index b0ddc50a45..870b278404 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 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__))); |