From owner-svn-src-head@freebsd.org Mon May 21 09:43:52 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66D81EEB54D; Mon, 21 May 2018 09:43:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 099A076B34; Mon, 21 May 2018 09:43:52 +0000 (UTC) (envelope-from eadler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D95B723419; Mon, 21 May 2018 09:43:51 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4L9hp8d058864; Mon, 21 May 2018 09:43:51 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4L9hpXl058860; Mon, 21 May 2018 09:43:51 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201805210943.w4L9hpXl058860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Mon, 21 May 2018 09:43:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333974 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 333974 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.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2018 09:43:52 -0000 Author: eadler Date: Mon May 21 09:43:50 2018 New Revision: 333974 URL: https://svnweb.freebsd.org/changeset/base/333974 Log: top(1): fix build Remove 'top.local.hs'. This was not noticed since /srv/obj/fbsd/srv/src/freebsd/svn/head/amd64.amd64/usr.bin/top/top.local.h existed locally on my machine despite "make clean". Only fully removing the objdir allowed me to observe the error directly. Pointyhat to: me Modified: head/usr.bin/top/Makefile head/usr.bin/top/display.c head/usr.bin/top/top.c head/usr.bin/top/username.c Modified: head/usr.bin/top/Makefile ============================================================================== --- head/usr.bin/top/Makefile Mon May 21 09:32:52 2018 (r333973) +++ head/usr.bin/top/Makefile Mon May 21 09:43:50 2018 (r333974) @@ -2,8 +2,7 @@ PROG= top SRCS= commands.c display.c machine.c screen.c top.c \ - username.c utils.c -SRCS+= sigdesc.h top.local.h + username.c utils.c sigdesc.h CFLAGS+= -I ${.OBJDIR} MAN= top.1 Modified: head/usr.bin/top/display.c ============================================================================== --- head/usr.bin/top/display.c Mon May 21 09:32:52 2018 (r333973) +++ head/usr.bin/top/display.c Mon May 21 09:43:50 2018 (r333974) @@ -44,7 +44,6 @@ #include "layout.h" /* defines for screen position layout */ #include "display.h" #include "top.h" -#include "top.local.h" #include "boolean.h" #include "machine.h" /* we should eliminate this!!! */ #include "utils.h" Modified: head/usr.bin/top/top.c ============================================================================== --- head/usr.bin/top/top.c Mon May 21 09:32:52 2018 (r333973) +++ head/usr.bin/top/top.c Mon May 21 09:43:50 2018 (r333974) @@ -31,7 +31,6 @@ #include "display.h" /* interface to display package */ #include "screen.h" /* interface to screen package */ #include "top.h" -#include "top.local.h" #include "boolean.h" #include "machine.h" #include "utils.h" Modified: head/usr.bin/top/username.c ============================================================================== --- head/usr.bin/top/username.c Mon May 21 09:32:52 2018 (r333973) +++ head/usr.bin/top/username.c Mon May 21 09:43:50 2018 (r333974) @@ -37,7 +37,6 @@ #include #include -#include "top.local.h" #include "utils.h" #include "username.h"