From owner-svn-src-all@freebsd.org Sun Jun 10 02:34:43 2018 Return-Path: Delivered-To: svn-src-all@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 990181009FE5; Sun, 10 Jun 2018 02:34:43 +0000 (UTC) (envelope-from jhb@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 49DC684BFD; Sun, 10 Jun 2018 02:34:43 +0000 (UTC) (envelope-from jhb@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 2B07126835; Sun, 10 Jun 2018 02:34:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5A2YhkL088596; Sun, 10 Jun 2018 02:34:43 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5A2YgpO088591; Sun, 10 Jun 2018 02:34:42 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201806100234.w5A2YgpO088591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sun, 10 Jun 2018 02:34:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334911 - in head/lib/libcompat: . 4.1 4.3 4.4 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/lib/libcompat: . 4.1 4.3 4.4 X-SVN-Commit-Revision: 334911 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.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 02:34:43 -0000 Author: jhb Date: Sun Jun 10 02:34:41 2018 New Revision: 334911 URL: https://svnweb.freebsd.org/changeset/base/334911 Log: Use __SCSSID() for SCCS IDs. While here, fix $FreeBSD$ ID in ftime.c to use __FBSDID instead of a static array. Modified: head/lib/libcompat/4.1/ftime.c head/lib/libcompat/4.3/re_comp.c head/lib/libcompat/4.3/rexec.c head/lib/libcompat/4.4/cuserid.c head/lib/libcompat/Makefile Modified: head/lib/libcompat/4.1/ftime.c ============================================================================== --- head/lib/libcompat/4.1/ftime.c Sun Jun 10 02:30:09 2018 (r334910) +++ head/lib/libcompat/4.1/ftime.c Sun Jun 10 02:34:41 2018 (r334911) @@ -30,9 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include Modified: head/lib/libcompat/4.3/re_comp.c ============================================================================== --- head/lib/libcompat/4.3/re_comp.c Sun Jun 10 02:30:09 2018 (r334910) +++ head/lib/libcompat/4.3/re_comp.c Sun Jun 10 02:34:41 2018 (r334911) @@ -34,6 +34,7 @@ #include __FBSDID("$FreeBSD$"); +__SCCSID("@(#)regex.c 5.1 (Berkeley) 3/29/92"); /* * Compatibility routines that implement the old re_comp/re_exec interface in @@ -41,10 +42,6 @@ __FBSDID("$FreeBSD$"); * rely on dark corners of re_comp/re_exec and won't work with this version, * but most programs should be fine. */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)regex.c 5.1 (Berkeley) 3/29/92"; -#endif /* LIBC_SCCS and not lint */ #include #include Modified: head/lib/libcompat/4.3/rexec.c ============================================================================== --- head/lib/libcompat/4.3/rexec.c Sun Jun 10 02:30:09 2018 (r334910) +++ head/lib/libcompat/4.3/rexec.c Sun Jun 10 02:34:41 2018 (r334911) @@ -27,13 +27,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); +__SCCSID("@(#)rexec.c 8.1 (Berkeley) 6/4/93"); #include #include Modified: head/lib/libcompat/4.4/cuserid.c ============================================================================== --- head/lib/libcompat/4.4/cuserid.c Sun Jun 10 02:30:09 2018 (r334910) +++ head/lib/libcompat/4.4/cuserid.c Sun Jun 10 02:34:41 2018 (r334911) @@ -29,11 +29,9 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)cuserid.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); +__SCCSID("@(#)cuserid.c 8.1 (Berkeley) 6/4/93"); #include #include Modified: head/lib/libcompat/Makefile ============================================================================== --- head/lib/libcompat/Makefile Sun Jun 10 02:30:09 2018 (r334910) +++ head/lib/libcompat/Makefile Sun Jun 10 02:34:41 2018 (r334911) @@ -3,7 +3,7 @@ PACKAGE=lib${LIB} LIB= compat -CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale +CFLAGS+=-I${SRCTOP}/lib/libc/locale NO_PIC= WARNS?= 0