Ported changes to support Windows

contrib/win32/win32compat/signal.c

@@ -31,9 +31,10 @@
 #include <errno.h>
 #include "w32fd.h"
 #include "signal_internal.h"
-#include "inc\signal.h"
 #include "debug.h"
 
+/* Apply caution while changing this order of inclusion of below 2 signal.h headers */
+#include "inc\signal.h"
 #undef signal
 #undef raise
 #undef SIGINT
@@ -46,7 +47,11 @@
 #undef SIG_DFL
 #undef SIG_IGN
 #undef SIG_ERR
+#undef NSIG
 #include <signal.h>
+#undef NSIG
+#define NSIG 0
+
 
 /* pending signals to be processed */
 sigset_t pending_signals;

contrib/win32/win32compat/ssh-agent/agent-request.h

@@ -5,6 +5,7 @@ typedef unsigned __int64 u_int64_t;
 #define __attribute__(a)
 #include "sshbuf.h"
 #include "sshkey.h"
+#include <openssl/bn.h>
 #include "authfd.h"
 #include "digest.h"