Backport cleanups from corosync
 - Centralize and standardize the handling of HZ
 - Remove unused enum

diff -r b907692f6e1f -r 09edbef89566 exec/tlist.h
--- a/exec/tlist.h	Mon Jan 26 20:46:12 2009 +0000
+++ b/exec/tlist.h	Fri Feb 06 11:34:06 2009 +0100
@@ -45,7 +45,7 @@
 
 #include "../include/list.h"
 
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#ifndef HZ
 	#define HZ 100  /* 10ms */
 #endif
 
diff -r b907692f6e1f -r 09edbef89566 exec/totem.h
--- a/exec/totem.h	Mon Jan 26 20:46:12 2009 +0000
+++ b/exec/totem.h	Fri Feb 06 11:34:06 2009 +0100
@@ -44,26 +44,6 @@
 #define SEND_THREADS_MAX	16
 #define INTERFACE_MAX		2
 
-/*
- * Array location of various timeouts as
- * specified in openais.conf.  The last enum
- * specifies the size of the timeouts array and
- * needs to remain the last item in the list.
- */
-enum {
-	TOTEM_RETRANSMITS_BEFORE_LOSS,
-	TOTEM_TOKEN,
-	TOTEM_RETRANSMIT_TOKEN,
-	TOTEM_HOLD_TOKEN,
-	TOTEM_JOIN,
-	TOTEM_CONSENSUS,
-	TOTEM_MERGE,
-	TOTEM_DOWNCHECK,
-	TOTEM_FAIL_RECV_CONST,
-
-	MAX_TOTEM_TIMEOUTS	/* Last item */
-} totem_timeout_types;
-
 struct totem_interface {
 	struct totem_ip_address bindnet;
 	struct totem_ip_address boundto;
diff -r b907692f6e1f -r 09edbef89566 exec/totemconfig.c
--- a/exec/totemconfig.c	Mon Jan 26 20:46:12 2009 +0000
+++ b/exec/totemconfig.c	Fri Feb 06 11:34:06 2009 +0100
@@ -52,10 +52,7 @@
 #include "totemconfig.h"
 #include "print.h"
 #include "objdb.h"
-
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
-	#define HZ 100  /* 10ms */
-#endif
+#include "tlist.h" /* for HZ */
 
 #define TOKEN_RETRANSMITS_BEFORE_LOSS_CONST	4
 #define TOKEN_TIMEOUT				1000