DEVEL15-aklog-stds-krb5-order-20060802 openafs-devel-1_5_5
authorDerrick Brashear <shadow@dementia.org>
Wed, 2 Aug 2006 20:55:56 +0000 (20:55 +0000)
committerDerrick Brashear <shadow@dementia.org>
Wed, 2 Aug 2006 20:55:56 +0000 (20:55 +0000)
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)

src/aklog/aklog_main.c
src/aklog/asetkey.c

index c5add33..344217c 100644 (file)
@@ -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
index 3898608..ecf7d68 100644 (file)
@@ -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>