* full_ipadr.c, gen_rname.c, port2ip.c, read_msg.c, write_msg.c:

Remove explicit includes of socket files.
* locate_kdc.c:  Remove <sys/types.h> and "os-proto.h".

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

7 files changed, 4 insertions, 26 deletions

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 97f67956a..dfac63ea8 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,9 @@
 Mon Mar 27 14:16:39 1995  John Gilmore  (gnu at toad.com)
 
+	* full_ipadr.c, gen_rname.c, port2ip.c, read_msg.c, write_msg.c:
+	Remove explicit includes of socket files.
+	* locate_kdc.c:  Remove <sys/types.h> and "os-proto.h".
+
 	* macsock.c (connect, send, recv):  Add for K5 compatability.
 	(getmyipaddr):  Add for use in K5.
 
diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c
index 94d99f276..775106431 100644
--- a/src/lib/krb5/os/full_ipadr.c
+++ b/src/lib/krb5/os/full_ipadr.c
@@ -30,9 +30,6 @@
 #ifdef KRB5_USE_INET
 
 #include "os-proto.h"
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_make_full_ipaddr(context, adr, port, outaddr)
diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c
index d56bb9160..d4b933de1 100644
--- a/src/lib/krb5/os/gen_rname.c
+++ b/src/lib/krb5/os/gen_rname.c
@@ -28,13 +28,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include "os-proto.h"
-#ifdef KRB5_USE_INET
-#include <sys/types.h>
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-#endif
 
 krb5_error_code INTERFACE
 krb5_gen_replay_name(context, address, uniq, string)
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index f5f1aab7c..e9ef69b09 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -27,8 +27,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include <stdio.h>
-#include <sys/types.h>
-#include "os-proto.h"
 
 #ifdef KRB5_USE_INET
 extern char *krb5_kdc_udp_portname;
diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c
index d8c5b23c1..7491727a5 100644
--- a/src/lib/krb5/os/port2ip.c
+++ b/src/lib/krb5/os/port2ip.c
@@ -29,9 +29,6 @@
 
 #ifdef KRB5_USE_INET
 #include "os-proto.h"
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_unpack_full_ipaddr(context, inaddr, adr, port)
diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index 749dae088..bd9cb6ea6 100644
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -27,9 +27,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include <errno.h>
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_read_message(context, fdp, inbuf)
@@ -65,4 +62,3 @@ krb5_read_message(context, fdp, inbuf)
 	inbuf->data = buf;
 	return(0);
 }
-
diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c
index 659b79bbe..85845c1da 100644
--- a/src/lib/krb5/os/write_msg.c
+++ b/src/lib/krb5/os/write_msg.c
@@ -27,9 +27,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include <errno.h>
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_write_message(context, fdp, outbuf)
@@ -49,7 +46,3 @@ krb5_write_message(context, fdp, outbuf)
 	}
 	return(0);
 }
-
-
-
-