drop NEED_TIME_H processing in krb.h

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

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index b8af2409d7b69ecbfc9809ee7975ee9e90a77206..58736cf571f2d650a1e8d7dd137d30f186c17de8 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,6 +1,8 @@
 2002-07-12  Ken Raeburn  <raeburn@mit.edu>
 
-       * krb.h: Don't include port-sockets.h.
+       * krb.h: Don't include port-sockets.h.  Don't check for
+       NEED_TIME_H, just don't include time.h and sys/time.h on
+       non-Windows platforms.
 
 2002-04-10  Danilo Almeida  <dalmeida@mit.edu>
 

diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 566de3b0b7055ab9b349ad742569dd92dcb7ddde..90d78aa10547f0c3163fb762de19d4276e769205 100644 (file)
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -336,14 +336,6 @@ typedef struct msg_dat MSG_DAT;
 /* Define u_char, u_short, u_int, and u_long. */
 #include <sys/types.h>
 
-#if !defined(_WINDOWS)
-#ifdef NEED_TIME_H
-#include <time.h>              /* For localtime, etc */
-#include <sys/time.h>
-#endif
-#endif /* !_WINDOWS */
-
-
 /* ask to disable IP address checking in the library */
 extern int krb_ignore_ip_address;
 

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index fd62503064e9f229ab20d07a06bd7f7d3c93d1a0..e4aa67cd6afcc956b46dfcf2d3022dc20dbb4ebf 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,5 +1,9 @@
 2002-07-12  Ken Raeburn  <raeburn@mit.edu>
 
+       * mac_time.c, stime.c: Don't define NEED_TIME_H; instead, include
+       time.h and sys/time.h when _WINDOWS isn't defined, which is what
+       krb.h used to do for NEED_TIME_H.
+
        * ad_print.c, cr_tkt.c, decomp_tkt.c, g_krbhst.c, g_phost.c,
        g_tkt_svc.c, mk_priv.c, mk_safe.c, netread.c, netwrite.c,
        prot_kdc.c, rd_priv.c, rd_safe.c, realmofhost.c, recvauth.c,

diff --git a/src/lib/krb4/mac_time.c b/src/lib/krb4/mac_time.c
index 28a56223dc8496d27b7293e5cda4aa2b0e5e9de8..7f5581bf886bcb7cf88df5e4334b20ba2b9c2859 100644 (file)
--- a/src/lib/krb4/mac_time.c
+++ b/src/lib/krb4/mac_time.c
@@ -12,10 +12,11 @@
 
 #include "mit-copyright.h"
 #define        DEFINE_SOCKADDR         /* For struct hostent, <netdb.h>, etc */
-#define NEED_TIME_H
 #include "krb.h"
 #include "des.h"
 #include "AddressXlation.h"    /* for ip_addr */
+#include <time.h>
+#include <sys/time.h>
 
 #include <script.h>                    /* Defines MachineLocation, used by getTimeZoneOffset */
 #include <ToolUtils.h>         /* Defines BitTst(), called by getTimeZoneOffset() */

diff --git a/src/lib/krb4/stime.c b/src/lib/krb4/stime.c
index d1261acb8c638ce5765da295f72888e8a0fdd372..55b30647285869f80d624aa29ae954c2b2bd5364 100644 (file)
--- a/src/lib/krb4/stime.c
+++ b/src/lib/krb4/stime.c
@@ -10,10 +10,13 @@
 
 #include "mit-copyright.h"
 #define        DEFINE_SOCKADDR
-#define NEED_TIME_H
 #include "krb.h"
 #include "krb4int.h"
 #include <stdio.h>                      /* for sprintf() */
+#ifndef _WINDOWS
+#include <time.h>
+#include <sys/time.h>
+#endif
 
 /*
  * Given a pointer to a long containing the number of seconds