* k5-platform.h (JOIN4, JOIN4_2, JOIN3, JOIN3_2): Unused macros deleted. (JOIN__2, JOIN__2_2): Renamed from JOIN2 and JOIN2_2. Insert two underscores between the tokens supplied. All uses changed to use new macros, and not use identifiers with leading underscores. To generate a diff of this commit: cvs diff -r1.428 -r1.429 krb5/src/include/ChangeLog cvs diff -r1.7 -r1.8 krb5/src/include/k5-platform.h