From 85a0ec50a577efb4cc15f9fe0b5bffe2a97e31db Mon Sep 17 00:00:00 2001
From: Jim Rees <rees@umich.edu>
Date: Tue, 18 Mar 2008 16:11:50 +0000
Subject: [PATCH] STABLE14-asetkey-includes-20060122

fix includes


(cherry picked from commit 42e90ef1a076eaea70ad4b587a3c25632b38bb88)
---
 src/aklog/.cvsignore | 4 ++++
 src/aklog/asetkey.c  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/aklog/.cvsignore

diff --git a/src/aklog/.cvsignore b/src/aklog/.cvsignore
new file mode 100644
index 0000000000..51469b1939
--- /dev/null
+++ b/src/aklog/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+aklog
+asetkey
+klog
diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 40b6708818..4b0cd02371 100644
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -7,10 +7,10 @@
  */
 
 #include <afsconfig.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -23,7 +23,9 @@
 #include <afs/stds.h>
 #include <krb5.h>
 
+#ifndef HAVE_KERBEROSV_HEIM_ERR_H
 #include <afs/com_err.h>
+#endif
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <afs/dirpath.h>