ftmod_libpri: Check for required features in configure and remove old-style log callbacks

Non-PRI_NEW_SET_API logging callbacks were only available in libpri-1.0 and older,
which also lacks PRI_IO_FUNCS (required) and wouldn't work anyway.

Explicitly check for both PRI_* feature defines at configure time and reject libpri
versions that lack them.

Remove the non-PRI_NEW_SET_API logging callbacks in ftmod_libpri.c.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich committed 2012-04-14 01:39:25 +02:00
1 parent 020724e103
commit 997550c511
2 files changed
+15 -20

No files matched your search

@@ -115,7 +115,6 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
}
#ifdef PRI_NEW_SET_API
/**
* \brief Logs a libpri message
* \param pri libpri structure
@@ -147,25 +146,6 @@ static void s_pri_error(struct pri *pri, char *s)
ftdm_log(FTDM_LOG_ERROR, "%s", s);
}
}
#else /* !PRI_NEW_SET_API */
/**
* \brief Logs a libpri message
* \param s Message string
*/
static void s_pri_message(char *s)
{
ftdm_log(FTDM_LOG_DEBUG, "%s", s);
}
/**
* \brief Logs a libpri error
* \param s Error string
*/
static void s_pri_error(char *s)
{
ftdm_log(FTDM_LOG_ERROR, "%s", s);
}
#endif
#define PRI_DEBUG_Q921_ALL (PRI_DEBUG_Q921_RAW | PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_STATE)