summaryrefslogtreecommitdiffstats
path: root/src/lib/gssapi
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2006-06-29 22:12:19 +0000
committerTom Yu <tlyu@mit.edu>2006-06-29 22:12:19 +0000
commitbd92069c3acbd6f623f0fedc6ba66123c12ffbe3 (patch)
treea542577028636af2391ae69d79388087b44ed5a6 /src/lib/gssapi
parent225af035a642c946a2c9b1c54a6c522fae9c58f6 (diff)
downloadkrb5-bd92069c3acbd6f623f0fedc6ba66123c12ffbe3.tar.gz
krb5-bd92069c3acbd6f623f0fedc6ba66123c12ffbe3.tar.xz
krb5-bd92069c3acbd6f623f0fedc6ba66123c12ffbe3.zip
re-order inclusions in spnego_mech.c to avoid breaking system headers
* 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: new tags: pullup target_version: 1.5 version_reported: 1.5 component: krb5-build git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18273 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
-rw-r--r--src/lib/gssapi/spnego/spnego_mech.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 1fb31b55b0..0db0b5f92b 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -41,8 +41,8 @@
#include <string.h>
#include <k5-int.h>
#include <krb5.h>
-#include "gssapiP_spnego.h"
#include <mglueP.h>
+#include "gssapiP_spnego.h"
#include <gssapi_err_generic.h>
#undef g_token_size