Sat Sep 15 16:56:45 2012 UTC ()
the result of the construct

#define FOO	defined(BAR)

#if FOO
 [conditional code]
#endif

is "undefined", according to C99 6.10.1 note 4. So, change code like
that to use the following paradigm

#if defined(BAR)
#define FOO	1
#else
#define FOO	0
#endif

#if FOO
 [conditional code]
#endif


(plunky)
diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_compat.h
diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_fil.h
diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_log.c
diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_nat.h
diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_proxy.h
cvs diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_compat.h (expand / switch to unified diff)

--- src/sys/external/bsd/ipf/netinet/ip_compat.h 2012/07/22 14:27:51 1.3
+++ src/sys/external/bsd/ipf/netinet/ip_compat.h 2012/09/15 16:56:45 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ip_compat.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ 1/* $NetBSD: ip_compat.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2012 by Darren Reed. 4 * Copyright (C) 2012 by Darren Reed.
5 * 5 *
6 * See the IPFILTER.LICENCE file for details on licencing. 6 * See the IPFILTER.LICENCE file for details on licencing.
7 * 7 *
8 * @(#)ip_compat.h 1.8 1/14/96 8 * @(#)ip_compat.h 1.8 1/14/96
9 * Id: ip_compat.h,v 1.1.1.2 2012/07/22 13:45:09 darrenr Exp 9 * Id: ip_compat.h,v 1.1.1.2 2012/07/22 13:45:09 darrenr Exp
10 */ 10 */
11 11
12#ifndef _NETINET_IP_COMPAT_H_ 12#ifndef _NETINET_IP_COMPAT_H_
13#define _NETINET_IP_COMPAT_H_ 13#define _NETINET_IP_COMPAT_H_
14 14
@@ -17,27 +17,31 @@ @@ -17,27 +17,31 @@
17# define const 17# define const
18#endif 18#endif
19 19
20#if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__) 20#if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__)
21# undef KERNEL 21# undef KERNEL
22# undef _KERNEL 22# undef _KERNEL
23# undef __KERNEL__ 23# undef __KERNEL__
24# define KERNEL 24# define KERNEL
25# define _KERNEL 25# define _KERNEL
26# define __KERNEL__ 26# define __KERNEL__
27#endif 27#endif
28 28
29#ifndef SOLARIS 29#ifndef SOLARIS
30#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) 30# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 31# define SOLARIS 1
 32# else
 33# define SOLARIS 0
 34# endif
31#endif 35#endif
32#if (defined(SOLARIS2) && (SOLARIS2 >= 8)) 36#if (defined(SOLARIS2) && (SOLARIS2 >= 8))
33# ifndef USE_INET6 37# ifndef USE_INET6
34# define USE_INET6 38# define USE_INET6
35# endif 39# endif
36#endif 40#endif
37#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ 41#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
38 !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6) 42 !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6)
39# define USE_INET6 43# define USE_INET6
40#endif 44#endif
41#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000) && \ 45#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000) && \
42 !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6) 46 !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6)
43# define USE_INET6 47# define USE_INET6
@@ -118,50 +122,75 @@ struct ether_addr { @@ -118,50 +122,75 @@ struct ether_addr {
118# define _KERNEL 122# define _KERNEL
119# define KERNEL 123# define KERNEL
120# endif 124# endif
121# ifdef __OpenBSD__ 125# ifdef __OpenBSD__
122struct file; 126struct file;
123# endif 127# endif
124# include <sys/uio.h> 128# include <sys/uio.h>
125# ifdef ADD_KERNEL 129# ifdef ADD_KERNEL
126# undef _KERNEL 130# undef _KERNEL
127# undef KERNEL 131# undef KERNEL
128# endif 132# endif
129#endif 133#endif
130 134
131#define NETBSD_GE_REV(x) (defined(__NetBSD_Version__) && \ 135#if defined(__NetBSD_Version__)
132 (__NetBSD_Version__ >= (x))) 136# define NETBSD_GE_REV(x) (__NetBSD_Version__ >= (x))
133#define NETBSD_GT_REV(x) (defined(__NetBSD_Version__) && \ 137# define NETBSD_GT_REV(x) (__NetBSD_Version__ > (x))
134 (__NetBSD_Version__ > (x))) 138# define NETBSD_LT_REV(x) (__NetBSD_Version__ < (x))
135#define NETBSD_LT_REV(x) (defined(__NetBSD_Version__) && \ 139#else
136 (__NetBSD_Version__ < (x))) 140# define NETBSD_GE_REV(x) 0
137#define FREEBSD_GE_REV(x) (defined(__FreeBSD_version) && \ 141# define NETBSD_GT_REV(x) 0
138 (__FreeBSD_version >= (x))) 142# define NETBSD_LT_REV(x) 0
139#define FREEBSD_GT_REV(x) (defined(__FreeBSD_version) && \ 143#endif
140 (__FreeBSD_version > (x))) 144
141#define FREEBSD_LT_REV(x) (defined(__FreeBSD_version) && \ 145#if defined(__FreeBSD_version)
142 (__FreeBSD_version < (x))) 146# define FREEBSD_GE_REV(x) (__FreeBSD_version >= (x))
143#define BSDOS_GE_REV(x) (defined(_BSDI_VERSION) && \ 147# define FREEBSD_GT_REV(x) (__FreeBSD_version > (x))
144 (_BSDI_VERSION >= (x))) 148# define FREEBSD_LT_REV(x) (__FreeBSD_version < (x))
145#define BSDOS_GT_REV(x) (defined(_BSDI_VERSION) && \ 149#else
146 (_BSDI_VERSION > (x))) 150# define FREEBSD_GE_REV(x) 0
147#define BSDOS_LT_REV(x) (defined(_BSDI_VERSION) && \ 151# define FREEBSD_GT_REV(x) 0
148 (_BSDI_VERSION < (x))) 152# define FREEBSD_LT_REV(x) 0
149#define OPENBSD_GE_REV(x) (defined(OpenBSD) && (OpenBSD >= (x))) 153#endif
150#define OPENBSD_GT_REV(x) (defined(OpenBSD) && (OpenBSD > (x))) 154
151#define OPENBSD_LT_REV(x) (defined(OpenBSD) && (OpenBSD < (x))) 155#if defined(_BSDI_VERSION)
152#define BSD_GE_YEAR(x) (defined(BSD) && (BSD >= (x))) 156# define BSDOS_GE_REV(x) (_BSDI_VERSION >= (x))
153#define BSD_GT_YEAR(x) (defined(BSD) && (BSD > (x))) 157# define BSDOS_GT_REV(x) (_BSDI_VERSION > (x))
154#define BSD_LT_YEAR(x) (defined(BSD) && (BSD < (x))) 158# define BSDOS_LT_REV(x) (_BSDI_VERSION < (x))
 159#else
 160# define BSDOS_GE_REV(x) 0
 161# define BSDOS_GT_REV(x) 0
 162# define BSDOS_LT_REV(x) 0
 163#endif
 164
 165#if defined(OpenBSD)
 166# define OPENBSD_GE_REV(x) (OpenBSD >= (x))
 167# define OPENBSD_GT_REV(x) (OpenBSD > (x))
 168# define OPENBSD_LT_REV(x) (OpenBSD < (x))
 169#else
 170# define OPENBSD_GE_REV(x) 0
 171# define OPENBSD_GT_REV(x) 0
 172# define OPENBSD_LT_REV(x) 0
 173#endif
 174
 175#if defined(BSD)
 176# define BSD_GE_YEAR(x) (BSD >= (x))
 177# define BSD_GT_YEAR(x) (BSD > (x))
 178# define BSD_LT_YEAR(x) (BSD < (x))
 179#else
 180# define BSD_GE_YEAR(x) 0
 181# define BSD_GT_YEAR(x) 0
 182# define BSD_LT_YEAR(x) 0
 183#endif
155 184
156 185
157/* ----------------------------------------------------------------------- */ 186/* ----------------------------------------------------------------------- */
158/* S O L A R I S */ 187/* S O L A R I S */
159/* ----------------------------------------------------------------------- */ 188/* ----------------------------------------------------------------------- */
160#if SOLARIS 189#if SOLARIS
161# define MENTAT 1 190# define MENTAT 1
162# include <sys/cmn_err.h> 191# include <sys/cmn_err.h>
163# include <sys/isa_defs.h> 192# include <sys/isa_defs.h>
164# include <sys/stream.h> 193# include <sys/stream.h>
165# include <sys/ioccom.h> 194# include <sys/ioccom.h>
166# include <sys/sysmacros.h> 195# include <sys/sysmacros.h>
167# include <sys/kmem.h> 196# include <sys/kmem.h>
cvs diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_fil.h (expand / switch to unified diff)

--- src/sys/external/bsd/ipf/netinet/ip_fil.h 2012/07/22 14:27:51 1.3
+++ src/sys/external/bsd/ipf/netinet/ip_fil.h 2012/09/15 16:56:45 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ip_fil.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ 1/* $NetBSD: ip_fil.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2012 by Darren Reed. 4 * Copyright (C) 2012 by Darren Reed.
5 * 5 *
6 * See the IPFILTER.LICENCE file for details on licencing. 6 * See the IPFILTER.LICENCE file for details on licencing.
7 * 7 *
8 * @(#)ip_fil.h 1.35 6/5/96 8 * @(#)ip_fil.h 1.35 6/5/96
9 * Id: ip_fil.h,v 1.1.1.2 2012/07/22 13:45:13 darrenr Exp 9 * Id: ip_fil.h,v 1.1.1.2 2012/07/22 13:45:13 darrenr Exp
10 */ 10 */
11 11
12#ifndef _NETINET_IP_FIL_H_ 12#ifndef _NETINET_IP_FIL_H_
13#define _NETINET_IP_FIL_H_ 13#define _NETINET_IP_FIL_H_
14 14
@@ -20,27 +20,31 @@ @@ -20,27 +20,31 @@
20#if defined(BSD) && defined(_KERNEL) 20#if defined(BSD) && defined(_KERNEL)
21# if NETBSD_LT_REV(399000000) || defined(__osf__) || FREEBSD_LT_REV(500043) 21# if NETBSD_LT_REV(399000000) || defined(__osf__) || FREEBSD_LT_REV(500043)
22# include <sys/select.h> 22# include <sys/select.h>
23# else 23# else
24# include <sys/selinfo.h> 24# include <sys/selinfo.h>
25# endif 25# endif
26#endif 26#endif
27 27
28#if !defined(linux) || !defined(_KERNEL) 28#if !defined(linux) || !defined(_KERNEL)
29# include <netinet/in.h> 29# include <netinet/in.h>
30#endif 30#endif
31 31
32#ifndef SOLARIS 32#ifndef SOLARIS
33# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) 33# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 34# define SOLARIS 1
 35# else
 36# define SOLARIS 0
 37# endif
34#endif 38#endif
35 39
36#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51) 40#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
37# define SIOCADAFR _IOW('r', 60, struct ipfobj) 41# define SIOCADAFR _IOW('r', 60, struct ipfobj)
38# define SIOCRMAFR _IOW('r', 61, struct ipfobj) 42# define SIOCRMAFR _IOW('r', 61, struct ipfobj)
39# define SIOCSETFF _IOW('r', 62, u_int) 43# define SIOCSETFF _IOW('r', 62, u_int)
40# define SIOCGETFF _IOR('r', 63, u_int) 44# define SIOCGETFF _IOR('r', 63, u_int)
41# define SIOCGETFS _IOWR('r', 64, struct ipfobj) 45# define SIOCGETFS _IOWR('r', 64, struct ipfobj)
42# define SIOCIPFFL _IOWR('r', 65, int) 46# define SIOCIPFFL _IOWR('r', 65, int)
43# define SIOCIPFFB _IOR('r', 66, int) 47# define SIOCIPFFB _IOR('r', 66, int)
44# define SIOCADIFR _IOW('r', 67, struct ipfobj) 48# define SIOCADIFR _IOW('r', 67, struct ipfobj)
45# define SIOCRMIFR _IOW('r', 68, struct ipfobj) 49# define SIOCRMIFR _IOW('r', 68, struct ipfobj)
46# define SIOCSWAPA _IOR('r', 69, u_int) 50# define SIOCSWAPA _IOR('r', 69, u_int)
cvs diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_log.c (expand / switch to unified diff)

--- src/sys/external/bsd/ipf/netinet/ip_log.c 2012/07/22 14:27:51 1.3
+++ src/sys/external/bsd/ipf/netinet/ip_log.c 2012/09/15 16:56:45 1.4
@@ -1,38 +1,42 @@ @@ -1,38 +1,42 @@
1/* $NetBSD: ip_log.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ 1/* $NetBSD: ip_log.c,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2012 by Darren Reed. 4 * Copyright (C) 2012 by Darren Reed.
5 * 5 *
6 * See the IPFILTER.LICENCE file for details on licencing. 6 * See the IPFILTER.LICENCE file for details on licencing.
7 * 7 *
8 * Id: ip_log.c,v 1.1.1.2 2012/07/22 13:45:19 darrenr Exp 8 * Id: ip_log.c,v 1.1.1.2 2012/07/22 13:45:19 darrenr Exp
9 */ 9 */
10 10
11#include <sys/cdefs.h> 11#include <sys/cdefs.h>
12__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $"); 12__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.4 2012/09/15 16:56:45 plunky Exp $");
13 13
14#include <sys/param.h> 14#include <sys/param.h>
15#if defined(KERNEL) || defined(_KERNEL) 15#if defined(KERNEL) || defined(_KERNEL)
16# undef KERNEL 16# undef KERNEL
17# undef _KERNEL 17# undef _KERNEL
18# define KERNEL 1 18# define KERNEL 1
19# define _KERNEL 1 19# define _KERNEL 1
20#endif 20#endif
21#if defined(__FreeBSD__) && !defined(_KERNEL) 21#if defined(__FreeBSD__) && !defined(_KERNEL)
22# include <osreldate.h> 22# include <osreldate.h>
23#endif 23#endif
24#ifndef SOLARIS 24#ifndef SOLARIS
25# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) 25# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 26# define SOLARIS 1
 27# else
 28# define SOLARIS 0
 29# endif
26#endif 30#endif
27#include <sys/errno.h> 31#include <sys/errno.h>
28#include <sys/types.h> 32#include <sys/types.h>
29#include <sys/file.h> 33#include <sys/file.h>
30#ifndef _KERNEL 34#ifndef _KERNEL
31# include <stdio.h> 35# include <stdio.h>
32# include <string.h> 36# include <string.h>
33# include <stdlib.h> 37# include <stdlib.h>
34# include <ctype.h> 38# include <ctype.h>
35# define _KERNEL 39# define _KERNEL
36# define KERNEL 40# define KERNEL
37# ifdef __OpenBSD__ 41# ifdef __OpenBSD__
38struct file; 42struct file;
cvs diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_nat.h (expand / switch to unified diff)

--- src/sys/external/bsd/ipf/netinet/ip_nat.h 2012/07/22 14:27:51 1.3
+++ src/sys/external/bsd/ipf/netinet/ip_nat.h 2012/09/15 16:56:45 1.4
@@ -1,29 +1,33 @@ @@ -1,29 +1,33 @@
1/* $NetBSD: ip_nat.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ 1/* $NetBSD: ip_nat.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2012 by Darren Reed. 4 * Copyright (C) 2012 by Darren Reed.
5 * 5 *
6 * See the IPFILTER.LICENCE file for details on licencing. 6 * See the IPFILTER.LICENCE file for details on licencing.
7 * 7 *
8 * @(#)ip_nat.h 1.5 2/4/96 8 * @(#)ip_nat.h 1.5 2/4/96
9 * Id: ip_nat.h,v 1.1.1.2 2012/07/22 13:45:29 darrenr Exp 9 * Id: ip_nat.h,v 1.1.1.2 2012/07/22 13:45:29 darrenr Exp
10 */ 10 */
11 11
12#ifndef __IP_NAT_H__ 12#ifndef __IP_NAT_H__
13#define __IP_NAT_H__ 13#define __IP_NAT_H__
14 14
15#ifndef SOLARIS 15#ifndef SOLARIS
16#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) 16# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 17# define SOLARIS 1
 18# else
 19# define SOLARIS 0
 20# endif
17#endif 21#endif
18 22
19#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51) 23#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
20#define SIOCADNAT _IOW('r', 60, struct ipfobj) 24#define SIOCADNAT _IOW('r', 60, struct ipfobj)
21#define SIOCRMNAT _IOW('r', 61, struct ipfobj) 25#define SIOCRMNAT _IOW('r', 61, struct ipfobj)
22#define SIOCGNATS _IOWR('r', 62, struct ipfobj) 26#define SIOCGNATS _IOWR('r', 62, struct ipfobj)
23#define SIOCGNATL _IOWR('r', 63, struct ipfobj) 27#define SIOCGNATL _IOWR('r', 63, struct ipfobj)
24#define SIOCPURGENAT _IOWR('r', 100, struct ipfobj) 28#define SIOCPURGENAT _IOWR('r', 100, struct ipfobj)
25#else 29#else
26#define SIOCADNAT _IOW(r, 60, struct ipfobj) 30#define SIOCADNAT _IOW(r, 60, struct ipfobj)
27#define SIOCRMNAT _IOW(r, 61, struct ipfobj) 31#define SIOCRMNAT _IOW(r, 61, struct ipfobj)
28#define SIOCGNATS _IOWR(r, 62, struct ipfobj) 32#define SIOCGNATS _IOWR(r, 62, struct ipfobj)
29#define SIOCGNATL _IOWR(r, 63, struct ipfobj) 33#define SIOCGNATL _IOWR(r, 63, struct ipfobj)
cvs diff -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_proxy.h (expand / switch to unified diff)

--- src/sys/external/bsd/ipf/netinet/ip_proxy.h 2012/07/22 14:27:51 1.3
+++ src/sys/external/bsd/ipf/netinet/ip_proxy.h 2012/09/15 16:56:45 1.4
@@ -1,28 +1,32 @@ @@ -1,28 +1,32 @@
1/* $NetBSD: ip_proxy.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ 1/* $NetBSD: ip_proxy.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2012 by Darren Reed. 4 * Copyright (C) 2012 by Darren Reed.
5 * 5 *
6 * See the IPFILTER.LICENCE file for details on licencing. 6 * See the IPFILTER.LICENCE file for details on licencing.
7 * 7 *
8 * Id: ip_proxy.h,v 1.1.1.2 2012/07/22 13:45:33 darrenr Exp 8 * Id: ip_proxy.h,v 1.1.1.2 2012/07/22 13:45:33 darrenr Exp
9 */ 9 */
10 10
11#ifndef _NETINET_IP_PROXY_H_ 11#ifndef _NETINET_IP_PROXY_H_
12#define _NETINET_IP_PROXY_H_ 12#define _NETINET_IP_PROXY_H_
13 13
14#ifndef SOLARIS 14#ifndef SOLARIS
15#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) 15# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 16# define SOLARIS 1
 17# else
 18# define SOLARIS 0
 19# endif
16#endif 20#endif
17 21
18#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51) 22#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
19#define SIOCPROXY _IOWR('r', 64, struct ap_control) 23#define SIOCPROXY _IOWR('r', 64, struct ap_control)
20#else 24#else
21#define SIOCPROXY _IOWR(r, 64, struct ap_control) 25#define SIOCPROXY _IOWR(r, 64, struct ap_control)
22#endif 26#endif
23 27
24#ifndef APR_LABELLEN 28#ifndef APR_LABELLEN
25#define APR_LABELLEN 16 29#define APR_LABELLEN 16
26#endif 30#endif
27#define AP_SESS_SIZE 53 31#define AP_SESS_SIZE 53
28 32