fix time include, move select include

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3864 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/server/adm_fmt_inq.c b/src/kadmin/server/adm_fmt_inq.c
index 8ce8acc42226bdf15982510e11e726d7a8e14d6f..a8c561e908d3fa6bcee6bde1d4bcc5550fb0b4be 100644 (file)
--- a/src/kadmin/server/adm_fmt_inq.c
+++ b/src/kadmin/server/adm_fmt_inq.c
@@ -42,14 +42,14 @@ static char rcsid_adm_fmt_inq[] =
 #include <com_err.h>
 #include <stdio.h>
 
-#if defined (unicos61) || (defined(mips) && defined(SYSTYPE_BSD43)) || defined(sysvimp)
+#ifdef USE_SYS_TIME_H
+#include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
 #include <time.h>
+#endif
 #else
-#include <sys/time.h>
-#endif  /* unicos61 */
-#if defined(aux20)
 #include <time.h>
-#endif  /* aux20 */
+#endif
 
 #define REALM_SEP      '@'
 #define REALM_SEP_STR  "@"

diff --git a/src/kadmin/server/adm_listen.c b/src/kadmin/server/adm_listen.c
index c0142ede2ec8dde85da87099c42da739b4f3f200..df00c5ee342d5fade608d76525ba8feda3ae4961 100644 (file)
--- a/src/kadmin/server/adm_listen.c
+++ b/src/kadmin/server/adm_listen.c
@@ -25,6 +25,10 @@ static char rcsid_adm_listen[] =
   adm_listen.c
 */
 
+#ifdef _AIX
+#include <sys/select.h>
+#endif
+
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <krb5/los-proto.h>
@@ -45,10 +49,6 @@ static char rcsid_adm_listen[] =
 #include <arpa/inet.h>
 #endif
 
-#ifdef _AIX
-#include <sys/select.h>
-#endif
-
 #include "adm_extern.h"
 
 int adm_debug_flag = 0;