From owner-svn-src-all@freebsd.org  Wed Aug 23 17:56:56 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 8D0E1DEC3F5;
 Wed, 23 Aug 2017 17:56:56 +0000 (UTC)
 (envelope-from emaste@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 59E5A7D1EB;
 Wed, 23 Aug 2017 17:56:56 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7NHutiU016264;
 Wed, 23 Aug 2017 17:56:55 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7NHutQM016263;
 Wed, 23 Aug 2017 17:56:55 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201708231756.v7NHutQM016263@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 23 Aug 2017 17:56:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322820 - head/contrib/top
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/contrib/top
X-SVN-Commit-Revision: 322820
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Aug 2017 17:56:56 -0000

Author: emaste
Date: Wed Aug 23 17:56:55 2017
New Revision: 322820
URL: https://svnweb.freebsd.org/changeset/base/322820

Log:
  top: use __mips__ and __NetBSD__ for consistency
  
  r322767 fixed the mips64 build failure with Clang with a minimal change
  to use __FreeBSD__ instead of FreeBSD in a #if test.  For consistency
  and to facilitate possible upstreaming change the other macros in the
  test to their canonical form.
  
  Discussed with:	jhb

Modified:
  head/contrib/top/loadavg.h

Modified: head/contrib/top/loadavg.h
==============================================================================
--- head/contrib/top/loadavg.h	Wed Aug 23 17:52:49 2017	(r322819)
+++ head/contrib/top/loadavg.h	Wed Aug 23 17:56:55 2017	(r322820)
@@ -19,7 +19,7 @@
  *
  * Defined types:  load_avg for load averages, pctcpu for cpu percentages.
  */
-#if defined(mips) && !(defined(NetBSD) || defined(__FreeBSD__))
+#if defined(__mips__) && !(defined(__NetBSD__) || defined(__FreeBSD__))
 # include <sys/fixpoint.h>
 # if defined(FBITS) && !defined(FSCALE)
 #  define FSCALE (1 << FBITS)	/* RISC/os on mips */