From 870b7e572dab611717acf7d2b0150cbb549c1b78 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Fri, 24 Sep 2010 03:39:29 +0000
Subject: Merged revisions 288637 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r288637 | tilghman | 2010-09-23 22:36:01 -0500 (Thu, 23 Sep 2010) | 9 lines

  Merged revisions 288636 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r288636 | tilghman | 2010-09-23 22:20:24 -0500 (Thu, 23 Sep 2010) | 2 lines

    Solaris compatibility fixes
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288638 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/strcompat.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'main')

diff --git a/main/strcompat.c b/main/strcompat.c
index 923e935f7..831ab0ce9 100644
--- a/main/strcompat.c
+++ b/main/strcompat.c
@@ -169,6 +169,19 @@ int vasprintf(char **strp, const char *fmt, va_list ap)
 }
 #endif /* !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC) */
 
+#ifndef HAVE_TIMERSUB
+void timersub(struct timeval *tvend, struct timeval *tvstart, struct timeval *tvdiff)
+{
+	tvdiff->tv_sec = tvend->tv_sec - tvstart->tv_sec;
+	tvdiff->tv_usec = tvend->tv_usec - tvstart->tv_usec;
+	if (tvdiff->tv_usec < 0) {
+		tvdiff->tv_sec --;
+		tvdiff->tv_usec += 1000000;
+	}
+
+}
+#endif
+
 /*
  * Based on Code from bsd-asprintf from OpenSSH
  * Copyright (c) 2004 Darren Tucker.
-- 
cgit v1.2.3