From d00bc0730af5323024c6f534cc547764b92099a7 Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Sun, 10 Jun 2018 02:34:41 +0000
Subject: [PATCH] Use __SCSSID() for SCCS IDs.

While here, fix $FreeBSD$ ID in ftime.c to use __FBSDID instead of a static
array.
---
 lib/libcompat/4.1/ftime.c   | 5 ++---
 lib/libcompat/4.3/re_comp.c | 5 +----
 lib/libcompat/4.3/rexec.c   | 8 +++-----
 lib/libcompat/4.4/cuserid.c | 4 +---
 lib/libcompat/Makefile      | 2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index f73f46bd0006..87860df00abd 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libcompat/4.3/re_comp.c b/lib/libcompat/4.3/re_comp.c
index fbfa19bac0b5..93fbc3c603a4 100644
--- a/lib/libcompat/4.3/re_comp.c
+++ b/lib/libcompat/4.3/re_comp.c
@@ -34,6 +34,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
+__SCCSID("@(#)regex.c	5.1 (Berkeley) 3/29/92");
 
 /*
  * Compatibility routines that implement the old re_comp/re_exec interface in
@@ -42,10 +43,6 @@ __FBSDID("$FreeBSD$");
  * 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 <regex.h>
 #include <stddef.h>
 #include <unistd.h>
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index edbe6fcc5f88..5a9690396621 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+__SCCSID("@(#)rexec.c	8.1 (Berkeley) 6/4/93");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index 325b763b8acc..0b993136f5cc 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
+__SCCSID("@(#)cuserid.c	8.1 (Berkeley) 6/4/93");
 
 #include <pwd.h>
 #include <stdio.h>
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index 4961b10af9ac..80f75c8dcae0 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -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