From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 2 Aug 2006 20:53:20 +0000 (+0000)
Subject: STABLE14-aklog-stds-krb5-order-20060802
X-Git-Tag: openafs-stable-1_4_2b3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=485f884088d81bf146199a56dfbcca3f4b8bce99;p=packages%2Fo%2Fopenafs.git

STABLE14-aklog-stds-krb5-order-20060802


kfm needs this first so when you include com_err.h from afs as a side effect of krb5.h we don't explode


(cherry picked from commit aebadcd5478994fec011368597004bef2439ccb6)
---

diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index c5add3317..344217cd2 100644
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -60,17 +60,16 @@ u_long ntohl(u_long x)
 /* #include <krb.h> */
 #endif /* 0 */
 
+#include <afs/stds.h>
 #include <krb5.h>
 
 #ifdef WINDOWS
 
-#include <afs/stds.h>
 #include <afs/auth.h>
 #include <rx/rxkad.h>
 #include <afs/dirpath.h>
 
 #else /* !WINDOWS */
-#include <afs/stds.h>
 #ifndef HAVE_KERBEROSV_HEIM_ERR_H
 #include <afs/com_err.h>
 #endif
diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 3898608ad..ecf7d686c 100644
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -22,9 +22,9 @@
 #endif /* HAVE_STRINGS_H */
 #endif /* HAVE_STRING_H */
 
+#include <afs/stds.h>
 #include <krb5.h>
 
-#include <afs/stds.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>