From a9697cb0f74cb1f50e4497bb70bf49357f0c425d Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Fri, 24 Sep 2010 03:36:01 +0000
Subject: 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.6.2@288637 f38db490-d61c-443f-a65b-d21fe96a405b
---
 include/asterisk/autoconfig.h.in |  3 +++
 include/asterisk/channel.h       | 13 -------------
 include/asterisk/compat.h        |  4 ++++
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index c7252d34b..69dc48490 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -469,6 +469,9 @@
 /* Define to indicate the PostgreSQL library */
 #undef HAVE_PGSQL
 
+/* Define to indicate presence of the pg_encoding_to_char API. */
+#undef HAVE_PGSQL_pg_encoding_to_char
+
 /* Define to 1 if your system defines IP_PKTINFO. */
 #undef HAVE_PKTINFO
 
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 9345a402d..88d1748c8 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1747,19 +1747,6 @@ static inline int ast_fdisset(struct pollfd *pfds, int fd, int maximum, int *sta
 	return 0;
 }
 
-#ifndef HAVE_TIMERSUB
-static inline 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
-
 /*! \brief Retrieves the current T38 state of a channel */
 static inline enum ast_t38_state ast_channel_get_t38_state(struct ast_channel *chan)
 {
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 519c71e68..365df66a1 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -113,6 +113,10 @@ int unsetenv(const char *name);
 int __attribute__((format(printf, 2, 0))) vasprintf(char **strp, const char *fmt, va_list ap);
 #endif
 
+#ifndef HAVE_TIMERSUB
+void timersub(struct timeval *tvend, struct timeval *tvstart, struct timeval *tvdiff);
+#endif
+
 #ifndef HAVE_STRLCAT
 size_t strlcat(char *dst, const char *src, size_t siz);
 #endif
-- 
cgit v1.2.3