Back out previous, completely broken, change (due to a foulup I was

compiling a different tree to the one I was committing to CVS).

diff --git a/ChangeLog b/ChangeLog
index 2e7678ecec27c010d9a475e02df057fe23efdcdf..e08e6783d785eaa71a5a73a5e3f64d6495c5c243 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-2008-06-02  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
-
-       * 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  <pmaydell@chiark.greenend.org.uk>
 
        * docs/README.developers: update the bits about doing a

diff --git a/h/prototypes.h b/h/prototypes.h
index d559baa15dd5142df9f92a1bd492c3f836905811..52fab3aa7fe4e8dcf05fc2f2507bb78b88dc6cfc 100644 (file)
--- 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 *, ...);