Add forgotten short->unsigned short redefinition #24862

Job	Run time
PR formatting / clang-format	33s
PR formatting / copyright headers	13s
PR formatting / line endings	1m 12s
PR formatting / whitespace	16s
PR formatting / pragma-once	7s
	2m 21s

Provide feedback