git: 75c6ce75099c - stable/12 - ipfilter: Removed unused ioctl typedef
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Oct 2022 00:32:28 UTC
The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=75c6ce75099cdeb40f144ad92a1c1a2357cee319 commit 75c6ce75099cdeb40f144ad92a1c1a2357cee319 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-10-07 10:05:53 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-10-16 00:32:07 +0000 ipfilter: Removed unused ioctl typedef Defunct operating systems no longer pollute the ipfilter sources. Remove their typedefs. (cherry picked from commit 1fcc50004cebbe3a578f6761936e5d8cd8ee24cd) --- sbin/ipf/common/ipf.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sbin/ipf/common/ipf.h b/sbin/ipf/common/ipf.h index 977b3f0fd105..db4ba91319ad 100644 --- a/sbin/ipf/common/ipf.h +++ b/sbin/ipf/common/ipf.h @@ -47,6 +47,7 @@ #include <errno.h> #include <limits.h> #include <netdb.h> +#include <stdarg.h> #include <stdlib.h> #include <stddef.h> #include <stdio.h> @@ -173,13 +174,7 @@ typedef struct proxyrule { } proxyrule_t; -#if defined(__NetBSD__) || defined(__FreeBSD__) || \ - SOLARIS -# include <stdarg.h> typedef int (* ioctlfunc_t)(int, ioctlcmd_t, ...); -#else -typedef int (* ioctlfunc_t)(dev_t, ioctlcmd_t, void *); -#endif typedef int (* addfunc_t)(int, ioctlfunc_t, void *); typedef int (* copyfunc_t)(void *, void *, size_t);