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 b7dd1d9c..fa0ccba7 100644
--- a/defines.h
+++ b/defines.h
@@ -822,14 +822,6 @@ struct winsize {
# define SSH_IOBUFSZ 8192
#endif
-#ifndef _NSIG
-# ifdef NSIG
-# define _NSIG NSIG
-# else
-# define _NSIG 128
-# endif
-#endif
-
/*
* Platforms that have arc4random_uniform() and not arc4random_stir()
* shouldn't need the latter.
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 62b6d0d8..d63cdf2f 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -46,6 +46,14 @@
# define _POSIX_VDISABLE VDISABLE
#endif
+#ifndef _NSIG
+# ifdef NSIG
+# define _NSIG NSIG
+# else
+# define _NSIG 128
+# endif
+#endif
+
static volatile sig_atomic_t signo[_NSIG];
static void handler(int);