[openssh-commits] [openssh] 01/01: Move definition of _NSIG.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 1734e276d99b17e92d4233fac7aef3a3180aaca7
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Wed Feb 25 13:40:45 2015 +1100

    Move definition of _NSIG.
    
    _NSIG is only unsed in one file, so move it there prevent redefinition
    warnings reported by Kevin Brott.
---
 defines.h                       | 8 --------
 openbsd-compat/readpassphrase.c | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defines.h b/defines.h
index b7dd1d9..fa0ccba 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 62b6d0d..d63cdf2 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.