[src/trunk]: src/games/fortune/strfile Now that we use "nbtool_config.h" we c...

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f6fd0a438117
branches:  trunk
changeset: 790100:f6fd0a438117
user:      uwe <uwe%NetBSD.org@localhost>
date:      Thu Sep 19 00:34:00 2013 +0000

description:
Now that we use "nbtool_config.h" we can use __dead again and drop
local attempts to define its equivalent.

Also drop the comment that warns this file is a tool; use of
"nbtool_config.h" makes it evident.

diffstat:

 games/fortune/strfile/strfile.c |  16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diffs (48 lines):

diff -r dd1ccd6799ed -r f6fd0a438117 games/fortune/strfile/strfile.c
--- a/games/fortune/strfile/strfile.c   Thu Sep 19 00:18:52 2013 +0000
+++ b/games/fortune/strfile/strfile.c   Thu Sep 19 00:34:00 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strfile.c,v 1.37 2013/09/19 00:18:52 uwe Exp $ */
+/*     $NetBSD: strfile.c,v 1.38 2013/09/19 00:34:00 uwe Exp $ */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -47,13 +47,11 @@
 #if 0
 static char sccsid[] = "@(#)strfile.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: strfile.c,v 1.37 2013/09/19 00:18:52 uwe Exp $");
+__RCSID("$NetBSD: strfile.c,v 1.38 2013/09/19 00:34:00 uwe Exp $");
 #endif
 #endif /* not lint */
 #endif /* __NetBSD__ */
 
-/* n.b.: this file is used at build-time - i.e. during build.sh. */
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <ctype.h>
@@ -71,14 +69,6 @@
 #define        MAXPATHLEN      1024
 #endif /* MAXPATHLEN */
 
-#if defined(__NetBSD__) || defined(__dead)
-#define NORETURN       __dead
-#elif defined __GNUC__
-#define NORETURN       __attribute__((__noreturn__))
-#else
-#define NORETURN
-#endif
-
 /*
  *     This program takes a file composed of strings separated by
  * lines starting with two consecutive delimiting character (default
@@ -141,7 +131,7 @@
 
 static uint32_t h2nl(uint32_t h);
 static void getargs(int argc, char **argv);
-static void usage(void) NORETURN;
+static void usage(void) __dead;
 static void add_offset(FILE *fp, off_t off);
 static void do_order(void);
 static int cmp_str(const void *vp1, const void *vp2);