From 871bd3b965321122be0db49961369b111e4ea4db Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 2 Jun 2008 22:05:11 +0000 Subject: [PATCH] Back out previous, completely broken, change (due to a foulup I was compiling a different tree to the one I was committing to CVS). --- ChangeLog | 6 ------ h/prototypes.h | 11 +---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e7678e..e08e678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,3 @@ -2008-06-02 Peter Maydell - - * h/prototypes.h: mark adios() as not returning, so gcc - can make a better job of avoiding spurious "uninitialized - variable" warnings. - 2008-06-01 Peter Maydell * docs/README.developers: update the bits about doing a diff --git a/h/prototypes.h b/h/prototypes.h index d559baa..52fab3a 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -5,15 +5,6 @@ * $Id$ */ -/* If we're using gcc then give it some information about - * functions that abort. - */ -#if __GNUC__ > 2 -#define NORETURN __attribute__((__noreturn__) -#else -#define NORETURN -#endif - /* * missing system prototypes */ @@ -34,7 +25,7 @@ char *etcpath(char *); /* * prototypes from the nmh subroutine library */ -void adios (char *, char *, ...) NORETURN; +void adios (char *, char *, ...); void admonish (char *, char *, ...); void advertise (char *, char *, char *, va_list); void advise (char *, char *, ...); -- 1.7.10.4