From d46847c026020cac3c33d647644474a8bd790011 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 11 Dec 2001 22:25:43 +0000
Subject: [PATCH] Use __FBSDID(). remove WARNS=2 as this is going to be
 default.

---
 usr.bin/what/Makefile |  1 -
 usr.bin/what/what.c   | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 73f2537015c5..8114290f968d 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	what
-WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 8bb97e508344..69ab1d4f8103 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -31,19 +31,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
+static const char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <err.h>
 #include <stdio.h>