summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2015-02-25 13:40:45 +1100
committerDarren Tucker <dtucker@zip.com.au>2015-02-25 13:40:45 +1100
commit1734e276d99b17e92d4233fac7aef3a3180aaca7 (patch)
tree3bacc892c97d1db09c0e4c046e8398b57abb697e
parenta47ead7c95cfbeb72721066c4da2312e5b1b9f3d (diff)
Move definition of _NSIG.
_NSIG is only unsed in one file, so move it there prevent redefinition warnings reported by Kevin Brott.
-rw-r--r--defines.h8
-rw-r--r--openbsd-compat/readpassphrase.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/defines.h b/defines.h
index b7dd1d9cf..fa0ccba7c 100644
--- a/defines.h
+++ b/defines.h
@@ -822,14 +822,6 @@ struct winsize {
822# define SSH_IOBUFSZ 8192 822# define SSH_IOBUFSZ 8192
823#endif 823#endif
824 824
825#ifndef _NSIG
826# ifdef NSIG
827# define _NSIG NSIG
828# else
829# define _NSIG 128
830# endif
831#endif
832
833/* 825/*
834 * Platforms that have arc4random_uniform() and not arc4random_stir() 826 * Platforms that have arc4random_uniform() and not arc4random_stir()
835 * shouldn't need the latter. 827 * shouldn't need the latter.
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 62b6d0d84..d63cdf2f0 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -46,6 +46,14 @@
46# define _POSIX_VDISABLE VDISABLE 46# define _POSIX_VDISABLE VDISABLE
47#endif 47#endif
48 48
49#ifndef _NSIG
50# ifdef NSIG
51# define _NSIG NSIG
52# else
53# define _NSIG 128
54# endif
55#endif
56
49static volatile sig_atomic_t signo[_NSIG]; 57static volatile sig_atomic_t signo[_NSIG];
50 58
51static void handler(int); 59static void handler(int);