Allow compile master on RHEL 6

corosync_timer_handle_t is know conditionally defined to prevent double
definition causing compile fault on RHEL 6 systems.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Angus Salkeld <asalkeld@redhat.com>

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,

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;