# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1142089032 0
# Node ID 5686ee0a3338453c3bf6edcec096d65b95b1d28f
# Parent  55a99934db873be2e63b5968fb6532e5d9bd02e4
put back the TIMEVAL_TO_TIMESPEC and timersub macros for Linux

diff -r 55a99934db87 -r 5686ee0a3338 scpmisc.h
--- a/scpmisc.h	Thu Mar 09 15:03:22 2006 +0000
+++ b/scpmisc.h	Sat Mar 11 14:57:12 2006 +0000
@@ -46,3 +46,24 @@
 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
+