Message ID | 20161019150640.24346-1-aurelien@aurel32.net |
---|---|
State | New |
Headers | show |
On Wed, 19 Oct 2016, Aurelien Jarno wrote: > * iconv/gconv.h (__gconv_info): Define __data element using a > zero-length array. OK.
On 2016-11-05 21:52, Joseph Myers wrote: > On Wed, 19 Oct 2016, Aurelien Jarno wrote: > > > * iconv/gconv.h (__gconv_info): Define __data element using a > > zero-length array. > > OK. Thanks for the review. Note that in the meantime GCC upstream reverted the change from the GCC 6 branch, but it's still there in the trunk. I have adjusted the commit message in consequence before committing it.
diff --git a/ChangeLog b/ChangeLog index 9b22678..1922c5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-10-19 Aurelien Jarno <aurelien@aurel32.net> + + * iconv/gconv.h (__gconv_info): Define __data element using a + zero-length array. + 2016-10-19 Joseph Myers <joseph@codesourcery.com> * math/bits/mathcalls.h [__GLIBC_USE (IEC_60559_BFP_EXT)] diff --git a/iconv/gconv.h b/iconv/gconv.h index 8d8ce58..a870280 100644 --- a/iconv/gconv.h +++ b/iconv/gconv.h @@ -139,7 +139,7 @@ typedef struct __gconv_info { size_t __nsteps; struct __gconv_step *__steps; - __extension__ struct __gconv_step_data __data __flexarr; + __extension__ struct __gconv_step_data __data[0]; } *__gconv_t; /* Transliteration using the locale's data. */