- (dtucker) [defines.h] Remove now-undeeded PRIu64 define.

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

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index b921524521304471b3ffd050e507e5e7aa85c03b..55f100ac04328624fee68e4763df1b864e2ea4e7 100644 (file)
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -16,9 +16,21 @@
  */
 
 #include "includes.h"
-#include "xmalloc.h"
 
-RCSID("$Id$");
+#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"
 
 #ifndef HAVE___PROGNAME
 char *__progname;
@@ -146,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);
 }