Module Name: src
Committed By: plunky
Date: Sat Sep 15 16:56:45 UTC 2012
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_compat.h ip_fil.h ip_log.c
ip_nat.h ip_proxy.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_compat.h \
src/sys/external/bsd/ipf/netinet/ip_fil.h \
src/sys/external/bsd/ipf/netinet/ip_log.c \
src/sys/external/bsd/ipf/netinet/ip_nat.h \
src/sys/external/bsd/ipf/netinet/ip_proxy.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/ip_compat.h
diff -u src/sys/external/bsd/ipf/netinet/ip_compat.h:1.3 src/sys/external/bsd/ipf/netinet/ip_compat.h:1.4
--- src/sys/external/bsd/ipf/netinet/ip_compat.h:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_compat.h Sat Sep 15 16:56:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_compat.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_compat.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -27,7 +27,11 @@
#endif
#ifndef SOLARIS
-#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# define SOLARIS 1
+# else
+# define SOLARIS 0
+# endif
#endif
#if (defined(SOLARIS2) && (SOLARIS2 >= 8))
# ifndef USE_INET6
@@ -128,30 +132,55 @@ struct file;
# endif
#endif
-#define NETBSD_GE_REV(x) (defined(__NetBSD_Version__) && \
- (__NetBSD_Version__ >= (x)))
-#define NETBSD_GT_REV(x) (defined(__NetBSD_Version__) && \
- (__NetBSD_Version__ > (x)))
-#define NETBSD_LT_REV(x) (defined(__NetBSD_Version__) && \
- (__NetBSD_Version__ < (x)))
-#define FREEBSD_GE_REV(x) (defined(__FreeBSD_version) && \
- (__FreeBSD_version >= (x)))
-#define FREEBSD_GT_REV(x) (defined(__FreeBSD_version) && \
- (__FreeBSD_version > (x)))
-#define FREEBSD_LT_REV(x) (defined(__FreeBSD_version) && \
- (__FreeBSD_version < (x)))
-#define BSDOS_GE_REV(x) (defined(_BSDI_VERSION) && \
- (_BSDI_VERSION >= (x)))
-#define BSDOS_GT_REV(x) (defined(_BSDI_VERSION) && \
- (_BSDI_VERSION > (x)))
-#define BSDOS_LT_REV(x) (defined(_BSDI_VERSION) && \
- (_BSDI_VERSION < (x)))
-#define OPENBSD_GE_REV(x) (defined(OpenBSD) && (OpenBSD >= (x)))
-#define OPENBSD_GT_REV(x) (defined(OpenBSD) && (OpenBSD > (x)))
-#define OPENBSD_LT_REV(x) (defined(OpenBSD) && (OpenBSD < (x)))
-#define BSD_GE_YEAR(x) (defined(BSD) && (BSD >= (x)))
-#define BSD_GT_YEAR(x) (defined(BSD) && (BSD > (x)))
-#define BSD_LT_YEAR(x) (defined(BSD) && (BSD < (x)))
+#if defined(__NetBSD_Version__)
+# define NETBSD_GE_REV(x) (__NetBSD_Version__ >= (x))
+# define NETBSD_GT_REV(x) (__NetBSD_Version__ > (x))
+# define NETBSD_LT_REV(x) (__NetBSD_Version__ < (x))
+#else
+# define NETBSD_GE_REV(x) 0
+# define NETBSD_GT_REV(x) 0
+# define NETBSD_LT_REV(x) 0
+#endif
+
+#if defined(__FreeBSD_version)
+# define FREEBSD_GE_REV(x) (__FreeBSD_version >= (x))
+# define FREEBSD_GT_REV(x) (__FreeBSD_version > (x))
+# define FREEBSD_LT_REV(x) (__FreeBSD_version < (x))
+#else
+# define FREEBSD_GE_REV(x) 0
+# define FREEBSD_GT_REV(x) 0
+# define FREEBSD_LT_REV(x) 0
+#endif
+
+#if defined(_BSDI_VERSION)
+# define BSDOS_GE_REV(x) (_BSDI_VERSION >= (x))
+# define BSDOS_GT_REV(x) (_BSDI_VERSION > (x))
+# define BSDOS_LT_REV(x) (_BSDI_VERSION < (x))
+#else
+# define BSDOS_GE_REV(x) 0
+# define BSDOS_GT_REV(x) 0
+# define BSDOS_LT_REV(x) 0
+#endif
+
+#if defined(OpenBSD)
+# define OPENBSD_GE_REV(x) (OpenBSD >= (x))
+# define OPENBSD_GT_REV(x) (OpenBSD > (x))
+# define OPENBSD_LT_REV(x) (OpenBSD < (x))
+#else
+# define OPENBSD_GE_REV(x) 0
+# define OPENBSD_GT_REV(x) 0
+# define OPENBSD_LT_REV(x) 0
+#endif
+
+#if defined(BSD)
+# define BSD_GE_YEAR(x) (BSD >= (x))
+# define BSD_GT_YEAR(x) (BSD > (x))
+# define BSD_LT_YEAR(x) (BSD < (x))
+#else
+# define BSD_GE_YEAR(x) 0
+# define BSD_GT_YEAR(x) 0
+# define BSD_LT_YEAR(x) 0
+#endif
/* ----------------------------------------------------------------------- */
Index: src/sys/external/bsd/ipf/netinet/ip_fil.h
diff -u src/sys/external/bsd/ipf/netinet/ip_fil.h:1.3 src/sys/external/bsd/ipf/netinet/ip_fil.h:1.4
--- src/sys/external/bsd/ipf/netinet/ip_fil.h:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_fil.h Sat Sep 15 16:56:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_fil.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -30,7 +30,11 @@
#endif
#ifndef SOLARIS
-# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# define SOLARIS 1
+# else
+# define SOLARIS 0
+# endif
#endif
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
Index: src/sys/external/bsd/ipf/netinet/ip_log.c
diff -u src/sys/external/bsd/ipf/netinet/ip_log.c:1.3 src/sys/external/bsd/ipf/netinet/ip_log.c:1.4
--- src/sys/external/bsd/ipf/netinet/ip_log.c:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_log.c Sat Sep 15 16:56:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_log.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_log.c,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.4 2012/09/15 16:56:45 plunky Exp $");
#include <sys/param.h>
#if defined(KERNEL) || defined(_KERNEL)
@@ -21,8 +21,12 @@ __KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1
#if defined(__FreeBSD__) && !defined(_KERNEL)
# include <osreldate.h>
#endif
-#ifndef SOLARIS
-# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+#ifndef SOLARIS
+# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# define SOLARIS 1
+# else
+# define SOLARIS 0
+# endif
#endif
#include <sys/errno.h>
#include <sys/types.h>
Index: src/sys/external/bsd/ipf/netinet/ip_nat.h
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.h:1.3 src/sys/external/bsd/ipf/netinet/ip_nat.h:1.4
--- src/sys/external/bsd/ipf/netinet/ip_nat.h:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_nat.h Sat Sep 15 16:56:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_nat.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -12,8 +12,12 @@
#ifndef __IP_NAT_H__
#define __IP_NAT_H__
-#ifndef SOLARIS
-#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+#ifndef SOLARIS
+# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# define SOLARIS 1
+# else
+# define SOLARIS 0
+# endif
#endif
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
Index: src/sys/external/bsd/ipf/netinet/ip_proxy.h
diff -u src/sys/external/bsd/ipf/netinet/ip_proxy.h:1.3 src/sys/external/bsd/ipf/netinet/ip_proxy.h:1.4
--- src/sys/external/bsd/ipf/netinet/ip_proxy.h:1.3 Sun Jul 22 14:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_proxy.h Sat Sep 15 16:56:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_proxy.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_proxy.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -12,7 +12,11 @@
#define _NETINET_IP_PROXY_H_
#ifndef SOLARIS
-#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+# define SOLARIS 1
+# else
+# define SOLARIS 0
+# endif
#endif
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
