From 12b62015e05fc649b31e2656f82a0a57872d0af0 Mon Sep 17 00:00:00 2001 From: Moises Silva Date: Mon, 22 Jun 2009 17:30:57 +0000 Subject: [PATCH] fixed small compilation issue when using the libsangoma included in the feature frozen wanpipe driver git-svn-id: http://svn.openzap.org/svn/openzap/trunk@748 a93c3328-9c30-0410-af19-c9cd2b2d52af --- .../openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c index e806a2f679..59386f4712 100644 --- a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c +++ b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c @@ -62,10 +62,14 @@ #define sangoma_create_socket_intr sangoma_open_api_span_chan #endif -/*! Starting with lbisangoma 3 we can use it, previous versions dont really work so we default to using the old stuff */ -#if defined(LIBSANGOMA_VERSION) && LIBSANGOMA_VERSION_CODE < LIBSANGOMA_VERSION(3,0,0) +/*! Starting with libsangoma 3 we can use the new libsangoma waitable API, the poor souls of those using a release were LIBSANGOMA version + * is defined but the version is not higher or equal to 3.0.0 will be forced to upgrade + * */ +#ifdef LIBSANGOMA_VERSION +#if LIBSANGOMA_VERSION_CODE < LIBSANGOMA_VERSION(3,0,0) #undef LIBSANGOMA_VERSION #endif +#endif /** * \brief Wanpipe flags @@ -970,13 +974,14 @@ ZIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event) */ static ZIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy) { - sangoma_wait_obj_t *sangoma_wait_obj; - +#ifdef LIBSANGOMA_VERSION if (zchan->mod_data) { sangoma_wait_obj = zchan->mod_data; + sangoma_wait_obj_t *sangoma_wait_obj; zchan->mod_data = NULL; sangoma_wait_obj_delete(&sangoma_wait_obj); } +#endif if (zchan->sockfd > -1) { close(zchan->sockfd);