* gssapi_krb5.h: Added #include of gssapi.h and gssapi_generic.h

	* gssapi_krb5.h: Added #include of gssapi.h and gssapi_generic.h
	for the Mac because we can't assume people will include them and
	get the OID macro and the old names on the Mac.

	* disp_status.c: Updated Mac OS X header paths.

	* gssapiP_krb5.h: Updated Mac OS X header paths and added
	prototype on Mac.

	* gssapi_krb5.h: Updated Mac OS X headers to new framework layout

	* gssapi_krb5.h, gssapi_krb5.c: Added oids from rfc 1964 using the
	suggested names.

	[pullups from 1-2-2-branch]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14646 dc483132-0cff-0310-8789-dd5450dbe970