The Windows calling convention for krb5int_c_combine_keys does not match the
prototype in k5-int.h.  I missed this during the initial commit since I
neglected to test out the build of this code on Windows.


To generate a diff of this commit:



	cvs diff -r5.124 -r5.125 krb5/src/lib/crypto/ChangeLog
	cvs diff -r5.1 -r5.2 krb5/src/lib/crypto/combine_keys.c