diff options
| author | dim <dim@FreeBSD.org> | 2016-08-31 18:00:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-08-31 18:00:41 +0000 |
| commit | 741d22d0325077858ccd9576a75daf0d600f42db (patch) | |
| tree | ed5647b4f763c247ffbbad31519753bb69de04fb /contrib/ipfilter | |
| parent | 9dae47b3c1884545f91d86bb78c2b763c40fd6a7 (diff) | |
| download | FreeBSD-src-741d22d0325077858ccd9576a75daf0d600f42db.zip FreeBSD-src-741d22d0325077858ccd9576a75daf0d600f42db.tar.gz | |
MFC r304953:
Define ipfilter's SOLARIS macro in a defined and portable way.
Reviewed by: cy
Differential Revision: https://reviews.freebsd.org/D7671
MFC r304959 (by kib):
Complete r304953.
Sponsored by: The FreeBSD Foundation
MFC r304964:
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
Diffstat (limited to 'contrib/ipfilter')
| -rw-r--r-- | contrib/ipfilter/opts.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/ipfilter/opts.h b/contrib/ipfilter/opts.h index 3c8b88b..6e97318 100644 --- a/contrib/ipfilter/opts.h +++ b/contrib/ipfilter/opts.h @@ -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 |
