summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2010-01-13 15:44:34 -0800
committerTim Rice <tim@multitalents.net>2010-01-13 15:44:34 -0800
commitd4a7fcbc462b2af134f6e59a6068fbe5b35fba80 (patch)
tree14a9ad785b26128d582ef402365ca15f11ed0050
parent096630d06c75f762efeb778f8b43def6f85976c0 (diff)
downloadopenssh-git-d4a7fcbc462b2af134f6e59a6068fbe5b35fba80.tar.gz
- (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG.
feedback and ok dtucker@
-rw-r--r--ChangeLog2
-rw-r--r--defines.h10
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18ce0aa3..1efed808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@
don't append a space after inserting a completion of a directory (i.e.
a path ending in '/') for a slightly better user experience; ok dtucker@
- (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
+ - (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG.
+ feedback and ok dtucker@
20100112
- (dtucker) OpenBSD CVS Sync
diff --git a/defines.h b/defines.h
index 3211cc91..c9b93bf7 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.158 2010/01/09 11:33:37 dtucker Exp $ */
+/* $Id: defines.h,v 1.159 2010/01/13 23:44:34 tim Exp $ */
/* Constants */
@@ -753,4 +753,12 @@ struct winsize {
# define SSH_IOBUFSZ 8192
#endif
+#ifndef _NSIG
+# ifdef NSIG
+# define _NSIG NSIG
+# else
+# define _NSIG 128
+# endif
+#endif
+
#endif /* _DEFINES_H */