Include "error.h" instead of simply declaring `void error ();'.

7 files changed, 7 insertions, 14 deletions

diff --git a/src/cat.c b/src/cat.c
index 30e1eda57..8ef9d7161 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -32,12 +32,12 @@
 #endif
 #include "system.h"
 #include "version.h"
+#include "error.h"
 
 #define max(h,i) ((h) > (i) ? (h) : (i))
 
 char *stpcpy ();
 char *xmalloc ();
-void error ();
 int full_write ();
 int safe_read ();
 
diff --git a/src/cksum.c b/src/cksum.c
index 802816d96..001e88238 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -109,12 +109,11 @@ main ()
 #include <sys/types.h>
 #include "system.h"
 #include "version.h"
+#include "error.h"
 
 /* Number of bytes to read at once.  */
 #define BUFLEN (1 << 16)
 
-void error ();
-
 /* The name this program was run with.  */
 char *program_name;
 
diff --git a/src/comm.c b/src/comm.c
index 3ed34cdf2..93e38f4a4 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -25,6 +25,7 @@
 #include "system.h"
 #include "linebuffer.h"
 #include "version.h"
+#include "error.h"
 
 #define min(x, y) ((x) < (y) ? (x) : (y))
 
@@ -53,7 +54,6 @@ static struct option const long_options[] =
   {0, 0, 0, 0}
 };
 
-void error ();
 static int compare_files ();
 static void writeline ();
 static void usage ();
diff --git a/src/csplit.c b/src/csplit.c
index 725d3c264..a51ad8f3b 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -30,6 +30,7 @@
 #include "regex.h"
 #include "system.h"
 #include "version.h"
+#include "error.h"
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>
@@ -42,10 +43,8 @@ char *realloc ();
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
-void error ();
 int safe_read ();
 
-
 static char *xrealloc ();
 static char *xmalloc ();
 static void cleanup ();
diff --git a/src/cut.c b/src/cut.c
index 79f1b5883..3a20a27c2 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -73,6 +73,7 @@
 #include <sys/types.h>
 #include "system.h"
 #include "version.h"
+#include "error.h"
 
 #define FATAL_ERROR(s)							\
   do									\
@@ -109,7 +110,6 @@ struct range_pair
 
 char *xmalloc ();
 char *xrealloc ();
-void error ();
 
 /* This buffer is used to support the semantics of the -s option
    (or lack of same) when the specified field list includes (does
diff --git a/src/expand.c b/src/expand.c
index fb6774abf..772d41d2f 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -43,6 +43,7 @@
 #include <sys/types.h>
 #include "system.h"
 #include "version.h"
+#include "error.h"
 
 /* The number of bytes added at a time to the amount of memory
    allocated for the output line. */
@@ -54,7 +55,6 @@
 
 char *xmalloc ();
 char *xrealloc ();
-void error ();
 
 static FILE *next_file ();
 static void add_tabstop ();
diff --git a/src/fmt.c b/src/fmt.c
index 2f9cd8ad6..be4fe3045 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -25,6 +25,7 @@
 
 #include "system.h"
 #include "version.h"
+#include "error.h"
 
 /* The following parameters represent the program's idea of what is
    "best".  Adjust to taste, subject to the caveats given.  */
@@ -144,12 +145,6 @@ struct Word
 #define	_(x) ()
 #endif
 
-#ifdef HAVE_VPRINTF
-void error _ ((int, int, const char *,...));
-#else
-void error ();
-#endif
-
 static void set_prefix _ ((char *p));
 static void fmt _ ((FILE *f));
 static bool get_paragraph _ ((FILE *f));