From 9fbfdbc5316981cdd27525320c0fe3740e9d086f Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Fri, 19 Jul 2019 20:24:05 -0500
Subject: bin/ed: make buildable with libbsd

---
 bin/ed/ed.h | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'bin/ed/ed.h')

diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 4f397c4..3c84761 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -33,9 +33,7 @@
 # include <sys/param.h>		/* for MAXPATHLEN */
 #endif
 #include <errno.h>
-#if defined(sun) || defined(__NetBSD__) || defined(__APPLE__)
-# include <limits.h>
-#endif
+#include <limits.h>
 #include <regex.h>
 #include <signal.h>
 #include <stdio.h>
@@ -53,11 +51,7 @@
 
 #define MINBUFSZ 512		/* minimum buffer size - must be > 0 */
 #define SE_MAX 30		/* max subexpressions in a regular expression */
-#ifdef INT_MAX
-# define LINECHARS INT_MAX	/* max chars per line */
-#else
-# define LINECHARS MAXINT	/* max chars per line */
-#endif
+#define LINECHARS INT_MAX	/* max chars per line */
 
 /* gflags */
 #define GLB 001		/* global command */
@@ -195,8 +189,8 @@ char *get_sbuf_line(line_t *);
 int get_shell_command(void);
 int get_stream_line(FILE *);
 int get_tty_line(void);
-__dead void handle_hup(int);
-__dead void handle_int(int);
+void handle_hup(int);
+void handle_int(int);
 void handle_winch(int);
 int has_trailing_escape(char *, char *);
 void init_buffers(void);
@@ -215,7 +209,7 @@ int put_des_char(int, FILE *);
 char *put_sbuf_line(char *);
 int put_stream_line(FILE *, char *, int);
 int put_tty_line(char *, int, long, int);
-__dead void quit(int);
+void quit(int);
 long read_file(char *, long);
 long read_stream(FILE *, long);
 int search_and_replace(pattern_t *, int, int);
@@ -229,7 +223,7 @@ void unmark_line_node(line_t *);
 void unset_active_nodes(line_t *, line_t *);
 long write_file(const char *, const char *, long, long);
 long write_stream(FILE *, long, long);
-void seterrmsg(const char *, ...) __printflike(1, 2);
+void seterrmsg(const char *, ...);
 
 /* global buffers */
 extern char stdinbuf[];
-- 
cgit v1.2.3-70-g09d2