diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-24 03:41:02 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-24 03:41:02 +0000 |
| commit | f8180257e040e68b36ea87959598b55e46c15919 (patch) | |
| tree | 307f62f875675a52717fd0ad060a0a0bca34f4ea /include/asterisk/channel.h | |
| parent | cfe811bb358ecc9e07ba42a0508453862592e5cc (diff) | |
Merged revisions 288638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r288638 | tilghman | 2010-09-23 22:39:29 -0500 (Thu, 23 Sep 2010) | 16 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@288639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index ed842b6d7..d12d478d3 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -2242,19 +2242,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) { |