From df5b8433e7d6dbfd27e9e203b743709359a04fb5 Mon Sep 17 00:00:00 2001 From: uwe Date: Thu, 19 Sep 2013 00:34:00 +0000 Subject: 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. --- fortune/strfile/strfile.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'fortune') diff --git a/fortune/strfile/strfile.c b/fortune/strfile/strfile.c index 6a4f8097..ae8f7b45 100644 --- a/fortune/strfile/strfile.c +++ b/fortune/strfile/strfile.c @@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\ #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 #include #include @@ -71,14 +69,6 @@ __RCSID("$NetBSD: strfile.c,v 1.37 2013/09/19 00:18:52 uwe Exp $"); #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 STR *Firstch; /* first chars of each string */ 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); -- cgit v1.2.3-56-ge451