Merge latest Org fixes (commit 7524ef2).

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

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 89ea7d9f60c7632b39e3fa6fb103a667e7784550..3208a895aa25aae455d5b4fb4d4b97f5b31ac300 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2013 Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
@@ -20,9 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -48,7 +46,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage(void) NO_RETURN;
+_Noreturn void usage (void);
 
 int
 main (int argc, char **argv)