From owner-svn-src-head@freebsd.org  Mon Jul  3 19:49:27 2017
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 261D19EE9C2;
 Mon,  3 Jul 2017 19:49:27 +0000 (UTC)
 (envelope-from sbruno@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 E8CF97F288;
 Mon,  3 Jul 2017 19:49:26 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v63JnQTp072986;
 Mon, 3 Jul 2017 19:49:26 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v63JnQ5c072985;
 Mon, 3 Jul 2017 19:49:26 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201707031949.v63JnQ5c072985@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 3 Jul 2017 19:49:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320616 - head/contrib/libpcap/bpf/net
X-SVN-Group: head
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: head/contrib/libpcap/bpf/net
X-SVN-Commit-Revision: 320616
X-SVN-Commit-Repository: base
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.23
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: Mon, 03 Jul 2017 19:49:27 -0000

Author: sbruno
Date: Mon Jul  3 19:49:25 2017
New Revision: 320616
URL: https://svnweb.freebsd.org/changeset/base/320616

Log:
  Clear clang warning:
    warning: macro expansion producing 'defined' has undefined behavior
    [-Wexpansion-to-defined]
  
  Submitted by:	Aaron Prieger <aprieger@llnw.com>
  Reviewed by:	dim
  Sponsored by:	Limelight Networks
  Differential Revision:	https://reviews.freebsd.org/D11166

Modified:
  head/contrib/libpcap/bpf/net/bpf_filter.c

Modified: head/contrib/libpcap/bpf/net/bpf_filter.c
==============================================================================
--- head/contrib/libpcap/bpf/net/bpf_filter.c	Mon Jul  3 19:46:12 2017	(r320615)
+++ head/contrib/libpcap/bpf/net/bpf_filter.c	Mon Jul  3 19:49:25 2017	(r320616)
@@ -61,7 +61,12 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#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(__hpux) || SOLARIS
 # include <sys/sysmacros.h>
 # include <sys/stream.h>