Fix build with gcc, remove redundand declarations.

Reported and tested by:	gjb
MFC after:	1 month
Fix build with gcc, do not use unnamed union.

Reported and tested by:	gjb
MFC after:	1 month