From b6a5c4e0e486760ed15bbdfd972d77444a6c4f9e Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 11 Dec 2001 23:18:25 +0000
Subject: [PATCH] WARNS=2 is to become the default, so remove. Use __FBSDID().

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

diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index dc127db03af0..5a25126e0c06 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	unexpand
-WARNS?=	2
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 2d548a038372..8c788172683c 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -31,19 +31,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
+static const char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 /*
  * unexpand - put tabs into a file replacing blanks