From b1468ee6f7b23d4340bb40529be929e63242dca7 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 29 Jun 2006 22:35:21 +0000 Subject: [PATCH] pull up r18273 from trunk r18273@cathode-dark-space: tlyu | 2006-06-29 18:12:19 -0400 ticket: new tags: pullup target_version: 1.5 version_reported: 1.5 subject: re-order inclusions in spnego_mech.c to avoid breaking system headers component: krb5-build * src/lib/gssapi/spnego/spnego_mech.c: Move inclusion of gssapiP_spnego.h to after mglueP.h. mglueP.h includes k5-thread.h, which pulls in the pthread headers, which on at least some Tru64 versions is vulnerable to definitions of non-reserved macro names such as CONTEXT, which is defined in gssapiP_spnego.h. ticket: 3959 version_fixed: 1.5 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18274 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/spnego/spnego_mech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index c5a15d5d4..19a2a8b4a 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -40,8 +40,8 @@ #include #include #include -#include "gssapiP_spnego.h" #include +#include "gssapiP_spnego.h" #include #undef g_token_size -- 2.26.2