You could drop all size-2 relevant code. I've added it only for completeness.
# define SIZEOF_WCHAR_T 2
The biggest change to your patch is that I define SIZEOF_WCHAR_T directly, without SIZE_OF_WCHAR_T_IS_2 etc since I do not see them in the source. Anyway, I am applying the patch. Bo
