The unified diff between revisions [7ad1775e..] and [8036b554..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "scpmisc.h"
#  from [14f223b0890febf280796d9cc48b37dbb212d311]
#    to [162472df78978824d5fc0838470aa9bc16f2b7d9]
#
============================================================
--- scpmisc.h	14f223b0890febf280796d9cc48b37dbb212d311
+++ scpmisc.h	162472df78978824d5fc0838470aa9bc16f2b7d9
@@ -46,3 +46,24 @@ void sanitise_stdfd(void);
 char *ssh_get_progname(char *);
 void fatal(char* fmt,...);
 void sanitise_stdfd(void);
+
+/* Required for non-BSD platforms, from OpenSSH's defines.h */
+#ifndef timersub
+#define timersub(a, b, result)                  \
+   do {                             \
+      (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;     \
+      (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;      \
+      if ((result)->tv_usec < 0) {              \
+     --(result)->tv_sec;                    \
+     (result)->tv_usec += 1000000;              \
+      }                             \
+   } while (0)
+#endif
+
+#ifndef TIMEVAL_TO_TIMESPEC
+#define TIMEVAL_TO_TIMESPEC(tv, ts) {                   \
+    (ts)->tv_sec = (tv)->tv_sec;                    \
+    (ts)->tv_nsec = (tv)->tv_usec * 1000;               \
+}
+#endif
+