On 10/26/2016 11:22 AM, Andreas Schwab wrote:

>> -static const char * __ucs4_to_ibm930sb[] =
>> +static const char __ucs4_to_ibm930sb[][2] =
>
> I think you can even make that [1].

Oh, right, I forgot.  That was the reason why I had postponed the 
cleanup. :-/

This version removes the indirection completely and adjusts the .c 
files, too.

Thanks,
Florian