diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /defines.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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.156 2009/08/28 01:21:07 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.159 2010/01/13 23:44:34 tim Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -753,4 +753,12 @@ struct winsize { | |||
753 | # define SSH_IOBUFSZ 8192 | 753 | # define SSH_IOBUFSZ 8192 |
754 | #endif | 754 | #endif |
755 | 755 | ||
756 | #ifndef _NSIG | ||
757 | # ifdef NSIG | ||
758 | # define _NSIG NSIG | ||
759 | # else | ||
760 | # define _NSIG 128 | ||
761 | # endif | ||
762 | #endif | ||
763 | |||
756 | #endif /* _DEFINES_H */ | 764 | #endif /* _DEFINES_H */ |