Used the NEED_SOCKETS mechanism to pull in winsock.h on the PC

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index a116425449a2573e2838a6164a30283168e8cd48..c829a55344b5c1b52901b62b6a68d72d508faa82 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 2 18:00:00 1995 Keith Vetter (keithv@fusion.com)
+
+       * ustime.c: added another include for the pc for prototyping.
+       * localaddr.c: used the NEED_SOCKETS mechanism for getting winsock.h.
+
 Wed Mar 1 17:30:00 1995 Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: made to work on the PC

diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 2e0a52a250ffe13ce7cf524a7d676da5241767e3..e3751af943ee212c421282a6315d2700cdc5de84 100644 (file)
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -27,6 +27,7 @@
  */
 
 
+#define NEED_SOCKETS
 #include "k5-int.h"
 
 #ifndef _MSDOS
@@ -226,8 +227,6 @@ krb5_os_localaddr(addr)
 /* No ioctls in winsock so we just assume there is only one networking 
  * card per machine, so gethostent is good enough. 
  */
-#include <krb5/winsock.h>
-#include <errno.h>
 
 krb5_error_code INTERFACE
 krb5_os_localaddr (krb5_address ***addr) {

diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c
index edc59b9a8e187581e864f0d443296be4999502da..f0bc9c7b3a3fc9d2c9c0207f6d79607e7a06fe27 100644 (file)
--- a/src/lib/krb5/os/ustime.c
+++ b/src/lib/krb5/os/ustime.c
@@ -66,6 +66,7 @@ krb5_us_timeofday(context, seconds, microseconds)
 #include <time.h>
 #include <sys/timeb.h>
 #include <dos.h>
+#include <string.h>
 
 /*
  * Time handling.  Translate Unix time calls into Kerberos internal 
@@ -113,7 +114,6 @@ win_gettime () {
     struct _timeb now;
     time_t time;
     long convert;                               /* MSC 7.00 bug work around */
-    void memset();
 
     _ftime(&now);                               /* Daylight savings time */