From 0e68265e129a85af8a4eeff4f79dae996eb834eb Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 7 Jun 2019 12:42:28 +0200 Subject: [PATCH] Remove sock.h old compatibility code. Shouldn't be needed anymore. (This provided FD_ZERO and such if the OS/libc did not provide it) --- src/Makefile.in | 2 +- src/modules/Makefile.in | 2 +- src/modules/chanmodes/Makefile.in | 2 +- src/modules/extbans/Makefile.in | 2 +- src/modules/snomasks/Makefile.in | 2 +- src/modules/third/Makefile.in | 2 +- src/modules/usermodes/Makefile.in | 2 +- src/s_auth.c | 2 -- src/s_bsd.c | 1 - src/s_dispatch.c | 1 - 10 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 7d2d29346..d68989d24 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -47,7 +47,7 @@ INCLUDES = ../include/auth.h ../include/channel.h \ ../include/modules.h ../include/modversion.h ../include/msg.h \ ../include/numeric.h ../include/proto.h \ ../include/resource.h ../include/setup.h \ - ../include/sock.h ../include/ssl.h ../include/struct.h ../include/sys.h \ + ../include/ssl.h ../include/struct.h ../include/sys.h \ ../include/threads.h ../include/types.h ../include/url.h \ ../include/version.h ../include/whowas.h \ ../include/openssl_hostname_validation.h diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index e4dc643fe..afaf887f3 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -30,7 +30,7 @@ INCLUDES = ../include/auth.h ../include/channel.h \ ../include/modules.h ../include/modversion.h ../include/msg.h \ ../include/numeric.h ../include/proto.h ../include/res.h \ ../include/resource.h ../include/setup.h \ - ../include/sock.h ../include/ssl.h ../include/struct.h ../include/sys.h \ + ../include/ssl.h ../include/struct.h ../include/sys.h \ ../include/threads.h ../include/types.h ../include/url.h \ ../include/version.h ../include/whowas.h diff --git a/src/modules/chanmodes/Makefile.in b/src/modules/chanmodes/Makefile.in index 44c1ab28b..5b74f71d1 100644 --- a/src/modules/chanmodes/Makefile.in +++ b/src/modules/chanmodes/Makefile.in @@ -27,7 +27,7 @@ INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ ../../include/resource.h ../../include/setup.h \ - ../../include/sock.h ../../include/ssl.h ../../include/struct.h ../../include/sys.h \ + ../../../include/ssl.h ../../include/struct.h ../../include/sys.h \ ../../include/threads.h ../../include/types.h ../../include/url.h \ ../../include/version.h ../../include/whowas.h diff --git a/src/modules/extbans/Makefile.in b/src/modules/extbans/Makefile.in index 58b23bb96..21a1e2675 100644 --- a/src/modules/extbans/Makefile.in +++ b/src/modules/extbans/Makefile.in @@ -27,7 +27,7 @@ INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ ../../include/resource.h ../../include/setup.h \ - ../../include/sock.h ../../include/ssl.h ../../include/struct.h ../../include/sys.h \ + ../../../include/ssl.h ../../include/struct.h ../../include/sys.h \ ../../include/threads.h ../../include/types.h ../../include/url.h \ ../../include/version.h ../../include/whowas.h diff --git a/src/modules/snomasks/Makefile.in b/src/modules/snomasks/Makefile.in index 0b6211b6f..937050715 100644 --- a/src/modules/snomasks/Makefile.in +++ b/src/modules/snomasks/Makefile.in @@ -27,7 +27,7 @@ INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ ../../include/resource.h ../../include/setup.h \ - ../../include/sock.h ../../include/ssl.h ../../include/struct.h ../../include/sys.h \ + ../../../include/ssl.h ../../include/struct.h ../../include/sys.h \ ../../include/threads.h ../../include/types.h ../../include/url.h \ ../../include/version.h ../../include/whowas.h diff --git a/src/modules/third/Makefile.in b/src/modules/third/Makefile.in index cb9f7d765..df3fe0596 100644 --- a/src/modules/third/Makefile.in +++ b/src/modules/third/Makefile.in @@ -27,7 +27,7 @@ INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ ../../include/resource.h ../../include/setup.h \ - ../../include/sock.h ../../include/ssl.h ../../include/struct.h ../../include/sys.h \ + ../../../include/ssl.h ../../include/struct.h ../../include/sys.h \ ../../include/threads.h ../../include/types.h ../../include/url.h \ ../../include/version.h ../../include/whowas.h diff --git a/src/modules/usermodes/Makefile.in b/src/modules/usermodes/Makefile.in index b4caaf250..b78940af8 100644 --- a/src/modules/usermodes/Makefile.in +++ b/src/modules/usermodes/Makefile.in @@ -27,7 +27,7 @@ INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ ../../include/resource.h ../../include/setup.h \ - ../../include/sock.h ../../include/ssl.h ../../include/struct.h ../../include/sys.h \ + ../../../include/ssl.h ../../include/struct.h ../../include/sys.h \ ../../include/threads.h ../../include/types.h ../../include/url.h \ ../../include/version.h ../../include/whowas.h diff --git a/src/s_auth.c b/src/s_auth.c index 9c99981a5..96001f615 100644 --- a/src/s_auth.c +++ b/src/s_auth.c @@ -31,8 +31,6 @@ #include #endif #include -#include "sock.h" /* If FD_ZERO isn't define up to this point, */ - /* define it (BSD4.2 needs this) */ #include "h.h" #include "res.h" #include "proto.h" diff --git a/src/s_bsd.c b/src/s_bsd.c index 65a7a4787..4c7ddcf6b 100644 --- a/src/s_bsd.c +++ b/src/s_bsd.c @@ -60,7 +60,6 @@ #include #include #include -#include "sock.h" /* If FD_ZERO isn't define up to this point, */ #include #ifndef _WIN32 #include diff --git a/src/s_dispatch.c b/src/s_dispatch.c index 4dc9e31c5..e73ac0d62 100644 --- a/src/s_dispatch.c +++ b/src/s_dispatch.c @@ -55,7 +55,6 @@ #include #include -#include "sock.h" /* If FD_ZERO isn't define up to this point, */ #include #include "proto.h" /* define it (BSD4.2 needs this) */