diff options
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 13 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 4 |
3 files changed, 7 insertions, 13 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index b715a89de..b438f4225 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -524,6 +524,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 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) { diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 22daeaef9..78c267105 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -133,6 +133,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 + #define strlcat __use__ast_str__functions_not__strlcat__ #define strlcpy __use__ast_copy_string__not__strlcpy__ |