On Tue, Aug 09, 2011 at 09:23:50AM +0200, Jan Friesse wrote: > corosync_timer_handle_t is know conditionally defined to prevent double > definition causing compile fault on RHEL 6 systems.
Reviewed-by: Angus Salkeld <[email protected]> > > Signed-off-by: Jan Friesse <[email protected]> > --- > exec/timer.h | 3 +++ > include/corosync/engine/coroapi.h | 4 ++++ > 2 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/exec/timer.h b/exec/timer.h > index cd2c108..e81b02b 100644 > --- a/exec/timer.h > +++ b/exec/timer.h > @@ -39,7 +39,10 @@ > #include <time.h> > #include <qb/qbloop.h> > > +#ifndef TIMER_HANDLE_T > typedef qb_loop_timer_handle corosync_timer_handle_t; > +#define TIMER_HANDLE_T 1 > +#endif > > extern int corosync_timer_add_duration ( > unsigned long long nanosec_duration, > diff --git a/include/corosync/engine/coroapi.h > b/include/corosync/engine/coroapi.h > index a8236f2..c1a6de5 100644 > --- a/include/corosync/engine/coroapi.h > +++ b/include/corosync/engine/coroapi.h > @@ -57,7 +57,11 @@ static inline void swab_mar_message_source_t > (mar_message_source_t *to_swab) > */ > to_swab->conn = NULL; > } > + > +#ifndef TIMER_HANDLE_T > typedef qb_loop_timer_handle corosync_timer_handle_t; > +#define TIMER_HANDLE_T 1 > +#endif > > struct corosync_tpg_group { > const void *group; > -- > 1.7.1 > > _______________________________________________ > Openais mailing list > [email protected] > https://lists.linux-foundation.org/mailman/listinfo/openais _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
