DEVEL15-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 c5add3317285a48df7d7d8a8ec79c9d0ad617007..344217cd2d035ede1724dd63a7ed3e3b7be25ae0 100644 (file)
--- 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 3898608adfca732e6ce86b01d5d68cbf8e05b1fa..ecf7d686c245cbc02cdd35086253deff006de2c3 100644 (file)
--- 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>