From owner-svn-src-head@freebsd.org  Sun Aug 28 11:51:47 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34EAEB78DC5;
 Sun, 28 Aug 2016 11:51:47 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 06167AB1;
 Sun, 28 Aug 2016 11:51:46 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7SBpkoO051785;
 Sun, 28 Aug 2016 11:51:46 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7SBpkd3051784;
 Sun, 28 Aug 2016 11:51:46 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201608281151.u7SBpkd3051784@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 28 Aug 2016 11:51:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304953 - head/sys/contrib/ipfilter/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Aug 2016 11:51:47 -0000

Author: dim
Date: Sun Aug 28 11:51:46 2016
New Revision: 304953
URL: https://svnweb.freebsd.org/changeset/base/304953

Log:
  Define ipfilter's SOLARIS macro in a defined and portable way.
  
  Reviewed by:	cy
  MFC after:	3 days
  Differential Revision: https://reviews.freebsd.org/D7671

Modified:
  head/sys/contrib/ipfilter/netinet/ip_compat.h

Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_compat.h	Sun Aug 28 07:40:11 2016	(r304952)
+++ head/sys/contrib/ipfilter/netinet/ip_compat.h	Sun Aug 28 11:51:46 2016	(r304953)
@@ -32,7 +32,11 @@
 # define 	__KERNEL__
 #endif
 
-#define	SOLARIS	(defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+#if defined(sun) && (defined(__svr4__) || defined(__SVR4))
+# define	SOLARIS		1
+#else
+# define	SOLARIS		0
+#endif
 
 
 #if defined(__SVR4) || defined(__svr4__) || defined(__sgi)