Patch coming.
Created attachment 8695 [details] Patch
Comment on attachment 8695 [details] Patch Removing the declarations is right, but I don't think the change to 3 to 4 is necessary. Characters that require 4 bytes in UTF-8 also require a surrogate pair in UTF-16, which is treated as two characters.
Comment on attachment 8695 [details] Patch r- (but fine with me if it turns out I am wrong about the UTF8 thing)
Thanks for the info about UTF-8; I hadn't considered that. I'm going to land just the header change.
Committed revision 14731.