summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
38 don't show .files by default in ls, add -a option to turn them back on; 38 don't show .files by default in ls, add -a option to turn them back on;
39 ok markus 39 ok markus
40 - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket". 40 - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".
41 - (dtucker) [defines.h] Define __dead if not already defined.
41 42
4220040620 4320040620
43 - (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms. 44 - (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.
@@ -1360,4 +1361,4 @@
1360 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1361 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1361 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1362 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1362 1363
1363$Id: ChangeLog,v 1.3428 2004/06/22 03:26:00 dtucker Exp $ 1364$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 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.116 2004/06/15 00:34:08 djm Exp $ */ 28/* $Id: defines.h,v 1.117 2004/06/22 03:27:16 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -424,6 +424,10 @@ struct winsize {
424# define __attribute__(x) 424# define __attribute__(x)
425#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ 425#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
426 426
427#ifndef __dead
428# define __dead __attribute__((noreturn))
429#endif
430
427/* *-*-nto-qnx doesn't define this macro in the system headers */ 431/* *-*-nto-qnx doesn't define this macro in the system headers */
428#ifdef MISSING_HOWMANY 432#ifdef MISSING_HOWMANY
429# define howmany(x,y) (((x)+((y)-1))/(y)) 433# define howmany(x,y) (((x)+((y)-1))/(y))