From fb5b808ab757f8da6a5bf191efc073904fa9799e Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 13 Jul 2002 02:08:09 +0000 Subject: [PATCH] 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 --- src/lib/krb4/ChangeLog | 6 ++++++ src/lib/krb4/ad_print.c | 1 - src/lib/krb4/g_phost.c | 1 - src/lib/krb4/g_tkt_svc.c | 1 - src/lib/krb4/gethostname.c | 1 - src/lib/krb4/mac_glue.c | 1 - src/lib/krb4/mac_stubs.c | 1 - src/lib/krb4/mac_time.c | 1 - src/lib/krb4/mk_auth.c | 1 - src/lib/krb4/mk_priv.c | 1 - src/lib/krb4/mk_req.c | 1 - src/lib/krb4/mk_safe.c | 1 - src/lib/krb4/netread.c | 1 - src/lib/krb4/netwrite.c | 1 - src/lib/krb4/rd_priv.c | 1 - src/lib/krb4/rd_safe.c | 1 - src/lib/krb4/realmofhost.c | 1 - src/lib/krb4/recvauth.c | 1 - src/lib/krb4/send_to_kdc.c | 1 - src/lib/krb4/sendauth.c | 1 - src/lib/krb4/stime.c | 1 - src/lib/krb4/win_glue.c | 1 - src/lib/krb4/win_time.c | 1 - src/windows/cns/ChangeLog | 4 ++++ src/windows/cns/cns.h | 1 - 25 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index e4aa67cd6..d25e6fac1 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,5 +1,11 @@ 2002-07-12 Ken Raeburn + * 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 119d79bf6..7d6de43b4 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 c2f4f2cb7..ba1108f21 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, , etc */ #include "krb.h" #include diff --git a/src/lib/krb4/g_tkt_svc.c b/src/lib/krb4/g_tkt_svc.c index 9bce98c20..f62571fb4 100644 --- a/src/lib/krb4/g_tkt_svc.c +++ b/src/lib/krb4/g_tkt_svc.c @@ -5,7 +5,6 @@ */ #include -#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 07425e616..caff02e73 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 ce3a6523f..77d11c2cc 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, , etc */ #include "krb.h" /* Mac Cincludes */ diff --git a/src/lib/krb4/mac_stubs.c b/src/lib/krb4/mac_stubs.c index b83e92d10..2cd1f0ac7 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, , 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 7f5581bf8..bec4d8f53 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, , 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 96d3dd3f1..9159ce177 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 #include "krb.h" #include "prot.h" diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c index 4523f318f..470ad9473 100644 --- a/src/lib/krb4/mk_priv.c +++ b/src/lib/krb4/mk_priv.c @@ -34,7 +34,6 @@ #include #include -#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 27b9d9adc..b5f02529b 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 6d1219f9f..2a157caad 100644 --- a/src/lib/krb4/mk_safe.c +++ b/src/lib/krb4/mk_safe.c @@ -35,7 +35,6 @@ #include #include -#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 7e68c92de..49edaade4 100644 --- a/src/lib/krb4/netread.c +++ b/src/lib/krb4/netread.c @@ -9,7 +9,6 @@ #include "mit-copyright.h" #include -#define DEFINE_SOCKADDR #include "krb.h" #ifdef HAVE_UNISTD_H #include diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c index 670ac6b2b..975d76ba7 100644 --- a/src/lib/krb4/netwrite.c +++ b/src/lib/krb4/netwrite.c @@ -9,7 +9,6 @@ #include "mit-copyright.h" #include -#define DEFINE_SOCKADDR #include "krb.h" #ifdef HAVE_UNISTD_H #include diff --git a/src/lib/krb4/rd_priv.c b/src/lib/krb4/rd_priv.c index 676b90884..1ba60081c 100644 --- a/src/lib/krb4/rd_priv.c +++ b/src/lib/krb4/rd_priv.c @@ -39,7 +39,6 @@ #include /* 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 5ba891f3e..7df0d6599 100644 --- a/src/lib/krb4/rd_safe.c +++ b/src/lib/krb4/rd_safe.c @@ -37,7 +37,6 @@ #include /* 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 80698a1ab..d818a89a5 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 diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c index 4e12c8623..a205ec6a4 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 #include diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c index c69507d76..701b975fd 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 f7fed7857..e4c8da7e6 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 diff --git a/src/lib/krb4/stime.c b/src/lib/krb4/stime.c index 55b306472..eea8ffe05 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 /* for sprintf() */ diff --git a/src/lib/krb4/win_glue.c b/src/lib/krb4/win_glue.c index 9d85a1c3f..e51cb9147 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 diff --git a/src/lib/krb4/win_time.c b/src/lib/krb4/win_time.c index 2334d289d..2560c3192 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 diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index fe7d3ae74..b7f6df475 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 Ken Raeburn + + * cns.h: Don't define DEFINE_SOCKADDR. + 2002-06-13 Ken Raeburn * 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 6ed5c7beb..7cc93ab9a 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" -- 2.26.2