summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-22 05:27:16 +0200
committerDarren Tucker <dtucker@zip.com.au>2004-06-22 05:27:16 +0200
commit59bf4a9bd44ce2c719437c74bd1e8e73b57d3c4a (patch)
tree178a546950b8f2bc08f972fcad10f6f5c4fd772c
parentMissing ChangeLog entry for previous (diff)
downloadopenssh-59bf4a9bd44ce2c719437c74bd1e8e73b57d3c4a.tar.xz
openssh-59bf4a9bd44ce2c719437c74bd1e8e73b57d3c4a.zip
- (dtucker) [defines.h] Define __dead if not already defined.
-rw-r--r--ChangeLog3
-rw-r--r--defines.h6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 226a93cc0..b3d09c70d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
don't show .files by default in ls, add -a option to turn them back on;
ok markus
- (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".
+ - (dtucker) [defines.h] Define __dead if not already defined.
20040620
- (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.
@@ -1360,4 +1361,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3428 2004/06/22 03:26:00 dtucker Exp $
+$Id: ChangeLog,v 1.3429 2004/06/22 03:27:16 dtucker Exp $
diff --git a/defines.h b/defines.h
index 73a45fe44..8c1d9c409 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.116 2004/06/15 00:34:08 djm Exp $ */
+/* $Id: defines.h,v 1.117 2004/06/22 03:27:16 dtucker Exp $ */
/* Constants */
@@ -424,6 +424,10 @@ struct winsize {
# define __attribute__(x)
#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
+#ifndef __dead
+# define __dead __attribute__((noreturn))
+#endif
+
/* *-*-nto-qnx doesn't define this macro in the system headers */
#ifdef MISSING_HOWMANY
# define howmany(x,y) (((x)+((y)-1))/(y))