Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 May 2018 09:43:51 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r333974 - head/usr.bin/top
Message-ID:  <201805210943.w4L9hpXl058860@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <stdlib.h>
 #include <string.h>
 
-#include "top.local.h"
 #include "utils.h"
 #include "username.h"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805210943.w4L9hpXl058860>