Merge changes from emacs-23

[gnu-emacs] / lib-src / hexl.c

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 231fd85a4f835d287621f167efe1113eb555ee24..b31ab812534c28ed83aa7b9ae05165509d2ed31d 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,6 +1,6 @@
 /* Convert files for Emacs Hexl mode.
    Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 2009  Free Software Foundation, Inc.
+                 2009, 2010  Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
@@ -49,12 +49,10 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage();
+void usage(void) NO_RETURN;
 
 int
-main (argc, argv)
-     int argc;
-     char *argv[];
+main (int argc, char **argv)
 {
   register long address;
   char string[18];
@@ -278,7 +276,7 @@ main (argc, argv)
 }
 
 void
-usage ()
+usage (void)
 {
   fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
   exit (EXIT_FAILURE);