d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow-up to r304953, in which I broke the build: apparently the SOLARIS

Browse Source 
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
This commit is contained in:
dim 2016-08-28 19:35:29 +00:00
parent f314defa9c
commit c9c476987e
6 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ipfilter/opts.h
View File

@ -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

10
sys/contrib/ipfilter/netinet/ip_compat.h
View File

@ -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

6
sys/contrib/ipfilter/netinet/ip_fil.h
View File

@ -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

10
sys/contrib/ipfilter/netinet/ip_log.c
View File

@ -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>

8
sys/contrib/ipfilter/netinet/ip_nat.h
View File

@ -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)

8
sys/contrib/ipfilter/netinet/ip_proxy.h
View File

@ -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)