From c2fac37d8af9668903e323fbd1a28cc6bb31a07b Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Fri, 31 May 2019 09:05:58 -0500
Subject: usr.bin/fold: make buildable with libbsd

---
 usr.bin/fold/fold.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 52ecc3d..b02caa6 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -32,23 +32,11 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1990, 1993\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
-#endif
-__RCSID("$NetBSD: fold.c,v 1.17 2011/09/04 20:24:59 joerg Exp $");
-#endif /* not lint */
-
 #include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <bsd/stdlib.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <err.h>
@@ -57,7 +45,7 @@ __RCSID("$NetBSD: fold.c,v 1.17 2011/09/04 20:24:59 joerg Exp $");
 
 static	void	fold(int);
 static	int	new_column_position(int, wint_t);
-__dead static	void	usage(void);
+static	void	usage(void) __attribute__((noreturn));
 
 static int count_bytes = 0;
 static int split_words = 0;
-- 
cgit v1.2.3-70-g09d2