diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-15 23:56:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-15 23:56:59 +0000 |
| commit | 4eeb2d3186d8c800dd59710c9f2a804f29a8282b (patch) | |
| tree | 04dd05599d72527a32aeed810f39f195a54ea0b8 /sys | |
| parent | 56dd4f23c1ab40ac890137f336b5a35c1b89cc4e (diff) | |
Stop including <sys/param.h> and other stuff. Assume this will be included
with sys limits in scope, so use PATH_MAX instead.
ok millert guenther
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pfvar.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index bb1f1f11d34..cc29c79a875 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.406 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: pfvar.h,v 1.407 2015/01/15 23:56:58 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -34,11 +34,10 @@ #ifndef _NET_PFVAR_H_ #define _NET_PFVAR_H_ -#include <sys/param.h> -#include <sys/types.h> #include <sys/queue.h> #include <sys/tree.h> #include <sys/rwlock.h> +#include <sys/syslimits.h> #include <net/radix.h> #include <net/route.h> @@ -1002,7 +1001,7 @@ struct pf_anchor { struct pf_anchor *parent; struct pf_anchor_node children; char name[PF_ANCHOR_NAME_SIZE]; - char path[MAXPATHLEN]; + char path[PATH_MAX]; struct pf_ruleset ruleset; int refcnt; /* anchor rules */ int match; @@ -1025,7 +1024,7 @@ RB_PROTOTYPE(pf_anchor_node, pf_anchor, entry_node, pf_anchor_compare); #define PFR_TFLAG_ALLMASK 0x0000007F struct pfr_table { - char pfrt_anchor[MAXPATHLEN]; + char pfrt_anchor[PATH_MAX]; char pfrt_name[PF_TABLE_NAME_SIZE]; u_int32_t pfrt_flags; u_int8_t pfrt_fback; @@ -1512,8 +1511,8 @@ struct pfioc_rule { u_int32_t action; u_int32_t ticket; u_int32_t nr; - char anchor[MAXPATHLEN]; - char anchor_call[MAXPATHLEN]; + char anchor[PATH_MAX]; + char anchor_call[PATH_MAX]; struct pf_rule rule; }; @@ -1588,7 +1587,7 @@ struct pfioc_limit { struct pfioc_ruleset { u_int32_t nr; - char path[MAXPATHLEN]; + char path[PATH_MAX]; char name[PF_ANCHOR_NAME_SIZE]; }; @@ -1597,7 +1596,7 @@ struct pfioc_trans { int esize; /* size of each element in bytes */ struct pfioc_trans_e { int type; - char anchor[MAXPATHLEN]; + char anchor[PATH_MAX]; u_int32_t ticket; } *array; }; |