Merge "Change wctype_t from enum to int"