2 files changed, 4 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 052b15bd9..1e173fec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,8 @@
      messages, etc.); bz #1329 ok dtucker@
   - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
     takes 2 more args.  with djm@
+  - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch
+    from Todd Vierling.
 
 20080611
  - (djm) [channels.c configure.ac]
@@ -4312,4 +4314,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4995 2008/06/13 00:24:03 dtucker Exp $
+$Id: ChangeLog,v 1.4996 2008/06/13 00:28:57 dtucker Exp $
diff --git a/defines.h b/defines.h
index 0665d2b51..a2fda9969 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.149 2008/06/08 20:17:53 dtucker Exp $ */
+/* $Id: defines.h,v 1.150 2008/06/13 00:28:57 dtucker Exp $ */
 
 
 /* Constants */
@@ -431,10 +431,6 @@ struct winsize {
 # define __attribute__(x)
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
-#ifndef __dead
-# define __dead __attribute__((noreturn))
-#endif
-
 #if !defined(HAVE_ATTRIBUTE__SENTINEL__) && !defined(__sentinel__)
 # define __sentinel__
 #endif