svn commit: r304964 - in head: contrib/ipfilter sys/contrib/ipfilter/netinet

[Dimitry Andric]

Author: dim
Date: Sun Aug 28 19:35:29 2016
New Revision: 304964
URL: https://svnweb.freebsd.org/changeset/base/304964

Log:
  Follow-up to r304953, in which I broke the build: apparently the SOLARIS
  macro is defined in lots of different places in ipfilter, so replace all
  of the nonportable definitions with portable ones.
  
  Pointy hat to:	dim
  X-MFC-With:	r304959, r304953
  MFC after:	3 days

Modified:
  head/contrib/ipfilter/opts.h
  head/sys/contrib/ipfilter/netinet/ip_compat.h
  head/sys/contrib/ipfilter/netinet/ip_fil.h
  head/sys/contrib/ipfilter/netinet/ip_log.c
  head/sys/contrib/ipfilter/netinet/ip_nat.h
  head/sys/contrib/ipfilter/netinet/ip_proxy.h

Modified: head/contrib/ipfilter/opts.h
==============================================================================
--- head/contrib/ipfilter/opts.h	Sun Aug 28 19:34:22 2016	(r304963)
+++ head/contrib/ipfilter/opts.h	Sun Aug 28 19:35:29 2016	(r304964)
@@ -12,7 +12,11 @@
 #define	__OPTS_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
 #define	OPT_REMOVE	0x000001
 #define	OPT_DEBUG	0x000002

Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_compat.h	Sun Aug 28 19:34:22 2016	(r304963)
+++ head/sys/contrib/ipfilter/netinet/ip_compat.h	Sun Aug 28 19:35:29 2016	(r304964)
@@ -32,10 +32,12 @@
 # define 	__KERNEL__
 #endif
 
-#if defined(sun) && (defined(__svr4__) || defined(__SVR4))
-# define	SOLARIS		1
-#else
-# define	SOLARIS		0
+#ifndef	SOLARIS
+# if defined(sun) && (defined(__svr4__) || defined(__SVR4))
+#  define	SOLARIS		1
+# else
+#  define	SOLARIS		0
+# endif
 #endif
 
 

Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_fil.h	Sun Aug 28 19:34:22 2016	(r304963)
+++ head/sys/contrib/ipfilter/netinet/ip_fil.h	Sun Aug 28 19:35:29 2016	(r304964)
@@ -29,7 +29,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
 
 #ifndef	__P

Modified: head/sys/contrib/ipfilter/netinet/ip_log.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_log.c	Sun Aug 28 19:34:22 2016	(r304963)
+++ head/sys/contrib/ipfilter/netinet/ip_log.c	Sun Aug 28 19:35:29 2016	(r304964)
@@ -19,11 +19,11 @@
 # include <osreldate.h>
 #endif
 #ifndef SOLARIS
-#if defined(sun) && (defined(__svr4__) || defined(__SVR4))
-# define	SOLARIS		1
-#else
-# define	SOLARIS		0
-#endif
+# if defined(sun) && (defined(__svr4__) || defined(__SVR4))
+#  define	SOLARIS		1
+# else
+#  define	SOLARIS		0
+# endif
 #endif
 #include <sys/errno.h>
 #include <sys/types.h>

Modified: head/sys/contrib/ipfilter/netinet/ip_nat.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_nat.h	Sun Aug 28 19:34:22 2016	(r304963)
+++ head/sys/contrib/ipfilter/netinet/ip_nat.h	Sun Aug 28 19:35:29 2016	(r304964)
@@ -13,8 +13,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)

Modified: head/sys/contrib/ipfilter/netinet/ip_proxy.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_proxy.h	Sun Aug 28 19:34:22 2016	(r304963)
+++ head/sys/contrib/ipfilter/netinet/ip_proxy.h	Sun Aug 28 19:35:29 2016	(r304964)
@@ -12,8 +12,12 @@
 #ifndef	__IP_PROXY_H__
 #define	__IP_PROXY_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)