* gss-misc.c: Include autoconf.h. If both time.h and sys/time.h are available,

and they're compatible, include both.

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

diff --git a/src/tests/gss-threads/ChangeLog b/src/tests/gss-threads/ChangeLog
index 2b4c17558b17ad752a59097bf603657bcc40b02d..11e71b730e8ad6426170f93423a4c172c43a6f8f 100644 (file)
--- a/src/tests/gss-threads/ChangeLog
+++ b/src/tests/gss-threads/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-11  Ken Raeburn  <raeburn@mit.edu>
+
+       * gss-misc.c: Include autoconf.h.  If both time.h and sys/time.h
+       are available, and they're compatible, include both.
+
 2005-02-09  Ken Raeburn  <raeburn@mit.edu>
 
        * New directory.

diff --git a/src/tests/gss-threads/gss-misc.c b/src/tests/gss-threads/gss-misc.c
index c912792e09ee2b197388e9c7026881908c750ab4..3405275fa5ca7b2fba4e86565f3455df290235f8 100644 (file)
--- a/src/tests/gss-threads/gss-misc.c
+++ b/src/tests/gss-threads/gss-misc.c
@@ -57,16 +57,18 @@ static char *rcsid = "$Header$";
 #include <sys/socket.h>
 #endif
 #include <errno.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>
 
 /* need struct timeval */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
+#if HAVE_TIME_H && (!HAVE_SYS_TIME_H || TIME_WITH_SYS_TIME)
+# include <time.h>
+#endif
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
 #endif
 
 #include <gssapi/gssapi_generic.h>