- (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c

[openssh.git] / openbsd-compat / bsd-misc.c

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index d2d9ad77171009238de390bb591d78469150f2d2..55f100ac04328624fee68e4763df1b864e2ea4e7 100644 (file)
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -17,7 +17,18 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+#include <string.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "xmalloc.h"
 
@@ -147,7 +158,8 @@ int nanosleep(const struct timespec *req, struct timespec *rem)
                tremain.tv_sec = 0;
                tremain.tv_usec = 0;
        }
-       TIMEVAL_TO_TIMESPEC(&tremain, rem)
+       if (rem != NULL)
+               TIMEVAL_TO_TIMESPEC(&tremain, rem)
 
        return(rc);
 }