Don't define DEFINE_SOCKADDR, since nothing tests it any more

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

25 files changed, 10 insertions, 23 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index e4aa67cd6a..d25e6fac17 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,5 +1,11 @@
 2002-07-12  Ken Raeburn  <raeburn@mit.edu>
 
+	* ad_print.c, g_phost.c, g_tkt_svc.c, gethostname.c, mac_glue.c,
+	mac_stubs.c, mac_time.c, mk_auth.c, mk_priv.c, mk_req.c,
+	mk_safe.c, netread.c, netwrite.c, rd_priv.c, rd_safe.c,
+	realmofhost.c, recvauth.c, send_to_kdc.c, sendauth.c, stime.c,
+	win_glue.c: Don't define DEFINE_SOCKADDR.
+
 	* 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.
diff --git a/src/lib/krb4/ad_print.c b/src/lib/krb4/ad_print.c
index 119d79bf69..7d6de43b4c 100644
--- a/src/lib/krb4/ad_print.c
+++ b/src/lib/krb4/ad_print.c
@@ -10,7 +10,6 @@
  */
 
 #include "mit-copyright.h"
-#define	DEFINE_SOCKADDR		/* Request definitions for sockets */
 #include "krb.h"
 #include "des.h"
 #include "krb4int.h"
diff --git a/src/lib/krb4/g_phost.c b/src/lib/krb4/g_phost.c
index c2f4f2cb74..ba1108f215 100644
--- a/src/lib/krb4/g_phost.c
+++ b/src/lib/krb4/g_phost.c
@@ -24,7 +24,6 @@
  * or implied warranty.
  */
 
-#define	DEFINE_SOCKADDR		/* For struct hostent, <netdb.h>, etc */
 #include "krb.h"
 
 #include <stdio.h>
diff --git a/src/lib/krb4/g_tkt_svc.c b/src/lib/krb4/g_tkt_svc.c
index 9bce98c205..f62571fb47 100644
--- a/src/lib/krb4/g_tkt_svc.c
+++ b/src/lib/krb4/g_tkt_svc.c
@@ -5,7 +5,6 @@
  */
 
 #include <string.h>
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 #include "port-sockets.h"
 
diff --git a/src/lib/krb4/gethostname.c b/src/lib/krb4/gethostname.c
index 07425e616c..caff02e737 100644
--- a/src/lib/krb4/gethostname.c
+++ b/src/lib/krb4/gethostname.c
@@ -8,7 +8,6 @@
  */
 
 #include "mit-copyright.h"
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 #include "krb4int.h"
 
diff --git a/src/lib/krb4/mac_glue.c b/src/lib/krb4/mac_glue.c
index ce3a6523f1..77d11c2ccf 100644
--- a/src/lib/krb4/mac_glue.c
+++ b/src/lib/krb4/mac_glue.c
@@ -10,7 +10,6 @@
  */
 
 #include "mit-copyright.h"
-#define	DEFINE_SOCKADDR		/* For struct hostent, <netdb.h>, etc */
 #include "krb.h"
 
 /* Mac Cincludes */
diff --git a/src/lib/krb4/mac_stubs.c b/src/lib/krb4/mac_stubs.c
index b83e92d10f..2cd1f0ac76 100644
--- a/src/lib/krb4/mac_stubs.c
+++ b/src/lib/krb4/mac_stubs.c
@@ -8,7 +8,6 @@
  * Applications call these routines, which then call the driver to do the work.
  */
 
-#define	DEFINE_SOCKADDR		/* For struct hostent, <netdb.h>, etc */
 #include "krb.h"
 #include "krb_driver.h"	/* Mac driver interface */
 
diff --git a/src/lib/krb4/mac_time.c b/src/lib/krb4/mac_time.c
index 7f5581bf88..bec4d8f530 100644
--- a/src/lib/krb4/mac_time.c
+++ b/src/lib/krb4/mac_time.c
@@ -11,7 +11,6 @@
  */
 
 #include "mit-copyright.h"
-#define	DEFINE_SOCKADDR		/* For struct hostent, <netdb.h>, etc */
 #include "krb.h"
 #include "des.h"
 #include "AddressXlation.h"	/* for ip_addr */
diff --git a/src/lib/krb4/mk_auth.c b/src/lib/krb4/mk_auth.c
index 96d3dd3f12..9159ce177b 100644
--- a/src/lib/krb4/mk_auth.c
+++ b/src/lib/krb4/mk_auth.c
@@ -26,7 +26,6 @@
  * Derived from sendauth.c by John Gilmore, 10 October 1994.
  */
 
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include <stdio.h>
 #include "krb.h"
 #include "prot.h"
diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c
index 4523f318f8..470ad94735 100644
--- a/src/lib/krb4/mk_priv.c
+++ b/src/lib/krb4/mk_priv.c
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include "prot.h"
 #include "des.h"
diff --git a/src/lib/krb4/mk_req.c b/src/lib/krb4/mk_req.c
index 27b9d9adca..b5f02529be 100644
--- a/src/lib/krb4/mk_req.c
+++ b/src/lib/krb4/mk_req.c
@@ -24,7 +24,6 @@
  * or implied warranty.
  */
 
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 #include "prot.h"
 #include "des.h"
diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c
index 6d1219f9f2..2a157caad4 100644
--- a/src/lib/krb4/mk_safe.c
+++ b/src/lib/krb4/mk_safe.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include "des.h"
 #include "prot.h"
diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c
index 7e68c92def..49edaade45 100644
--- a/src/lib/krb4/netread.c
+++ b/src/lib/krb4/netread.c
@@ -9,7 +9,6 @@
 
 #include "mit-copyright.h"
 #include <errno.h>
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c
index 670ac6b2bc..975d76ba7d 100644
--- a/src/lib/krb4/netwrite.c
+++ b/src/lib/krb4/netwrite.c
@@ -9,7 +9,6 @@
 
 #include "mit-copyright.h"
 #include <errno.h>
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/lib/krb4/rd_priv.c b/src/lib/krb4/rd_priv.c
index 676b90884e..1ba60081c8 100644
--- a/src/lib/krb4/rd_priv.c
+++ b/src/lib/krb4/rd_priv.c
@@ -39,7 +39,6 @@
 #include <string.h>
 
 /* application include files */
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include "prot.h"
 #include "des.h"
diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c
index 5ba891f3e1..7df0d6599a 100644
--- a/src/lib/krb4/rd_safe.c
+++ b/src/lib/krb4/rd_safe.c
@@ -37,7 +37,6 @@
 #include <string.h>
 
 /* application include files */
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include "prot.h"
 #include "des.h"
diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c
index 80698a1ab3..d818a89a5d 100644
--- a/src/lib/krb4/realmofhost.c
+++ b/src/lib/krb4/realmofhost.c
@@ -10,7 +10,6 @@
  */
 
 #include "mit-copyright.h"
-#define	DEFINE_SOCKADDR		/* Ask for MAXHOSTNAMELEN */
 #include "krb.h"
 
 #include <string.h>
diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c
index 4e12c86232..a205ec6a42 100644
--- a/src/lib/krb4/recvauth.c
+++ b/src/lib/krb4/recvauth.c
@@ -9,7 +9,6 @@
 
 #include "mit-copyright.h"
 
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c
index c69507d76f..701b975fd2 100644
--- a/src/lib/krb4/send_to_kdc.c
+++ b/src/lib/krb4/send_to_kdc.c
@@ -9,7 +9,6 @@
 
 #include "mit-copyright.h"
 
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include "krbports.h"
 #include "prot.h"
diff --git a/src/lib/krb4/sendauth.c b/src/lib/krb4/sendauth.c
index f7fed7857a..e4c8da7e6d 100644
--- a/src/lib/krb4/sendauth.c
+++ b/src/lib/krb4/sendauth.c
@@ -10,7 +10,6 @@
 
 #include "mit-copyright.h"
 
-#define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
 #include "krb4int.h"
 #include <errno.h>
diff --git a/src/lib/krb4/stime.c b/src/lib/krb4/stime.c
index 55b3064728..eea8ffe053 100644
--- a/src/lib/krb4/stime.c
+++ b/src/lib/krb4/stime.c
@@ -9,7 +9,6 @@
  */
 
 #include "mit-copyright.h"
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 #include "krb4int.h"
 #include <stdio.h>                      /* for sprintf() */
diff --git a/src/lib/krb4/win_glue.c b/src/lib/krb4/win_glue.c
index 9d85a1c3f6..e51cb9147f 100644
--- a/src/lib/krb4/win_glue.c
+++ b/src/lib/krb4/win_glue.c
@@ -7,7 +7,6 @@
  * Public Domain.
  */
 
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 
 #include <sys/types.h>
diff --git a/src/lib/krb4/win_time.c b/src/lib/krb4/win_time.c
index 2334d289d3..2560c3192d 100644
--- a/src/lib/krb4/win_time.c
+++ b/src/lib/krb4/win_time.c
@@ -7,7 +7,6 @@
  * Public Domain.
  */
 
-#define	DEFINE_SOCKADDR
 #include "krb.h"
 
 #include <sys/types.h>
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index fe7d3ae743..b7f6df4750 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+	* cns.h: Don't define DEFINE_SOCKADDR.
+
 2002-06-13  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
diff --git a/src/windows/cns/cns.h b/src/windows/cns/cns.h
index 6ed5c7beb9..7cc93ab9ae 100644
--- a/src/windows/cns/cns.h
+++ b/src/windows/cns/cns.h
@@ -15,7 +15,6 @@
 #ifndef RC_INVOKED
 
 #ifdef KRB4
-#define	DEFINE_SOCKADDR
 #include "mit-copyright.h"
 #include "krb.h"
 #include "kadm.h"