fix timersub warning on freebsd

Make them all protected by #ifndef timersub

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>

services/pload.c

@@ -333,18 +333,17 @@ static void message_handler_req_exec_pload_start (
 
 	start_mcasting ();
 }
-
 #ifndef timersub
-# define timersub(a, b, result)                                               \
-  do {                                                                        \
-    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;                             \
-    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;                          \
-    if ((result)->tv_usec < 0) {                                              \
-      --(result)->tv_sec;                                                     \
-      (result)->tv_usec += 1000000;                                           \
-    }                                                                         \
-  } while (0)
-#endif
+#define timersub(a, b, result)					\
+do {								\
+	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;		\
+	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;	\
+	if ((result)->tv_usec < 0) {				\
+		--(result)->tv_sec;				\
+		(result)->tv_usec += 1000000;			\
+	}							\
+} while (0)
+#endif /* timersub */
 
 unsigned long long int tv1;
 unsigned long long int tv2;

test/cpgbench.c

@@ -54,17 +54,17 @@
 #include <corosync/corotypes.h>
 #include <corosync/cpg.h>
 
-#ifdef COROSYNC_SOLARIS
+#ifndef timersub
 #define timersub(a, b, result)						\
-    do {								\
-	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			\
-	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;		\
-	if ((result)->tv_usec < 0) {					\
-	    --(result)->tv_sec;						\
-	    (result)->tv_usec += 1000000;				\
-	}								\
-    } while (0)
-#endif
+	do {								\
+		(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;		\
+		(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;	\
+		if ((result)->tv_usec < 0) {				\
+			--(result)->tv_sec;				\
+			(result)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+#endif /* timersub */
 
 static int alarm_notice;
 

test/cpgbenchzc.c

@@ -54,15 +54,15 @@
 #include <corosync/corotypes.h>
 #include <corosync/cpg.h>
 
-#ifdef COROSYNC_SOLARIS
-#define timersub(a, b, result)						\
-    do {								\
-	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			\
-	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;		\
-	if ((result)->tv_usec < 0) {					\
-	    --(result)->tv_sec;						\
-	    (result)->tv_usec += 1000000;				\
-	}								\
+#ifndef timersub
+#define timersub(a, b, result)					\
+    do {							\
+	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;		\
+	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;	\
+	if ((result)->tv_usec < 0) {				\
+	    --(result)->tv_sec;					\
+	    (result)->tv_usec += 1000000;			\
+	}							\
     } while (0)
 #endif
 

tools/corosync-pload.c

@@ -52,15 +52,17 @@
 #include <corosync/corotypes.h>
 #include <corosync/pload.h>
 
-#define timersub(a, b, result)						\
-do {									\
-	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			\
-	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;		\
-	if ((result)->tv_usec < 0) {					\
-		--(result)->tv_sec;					\
-		(result)->tv_usec += 1000000;				\
-	}								\
+#ifndef timersub
+#define timersub(a, b, result)					\
+do {								\
+	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;		\
+	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;	\
+	if ((result)->tv_usec < 0) {				\
+		--(result)->tv_sec;				\
+		(result)->tv_usec += 1000000;			\
+	}							\
 } while (0)
+#endif /* timersub */
 
 int main (void) {
 	pload_error_t result;