Merge commit 'ee92f7c' into bfgminer-2.9.x

compat.h

@@ -3,6 +3,8 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
 // NOTE: Nested preprocessor checks since the latter isn't defined at all without the former
 #ifdef HAVE_LIBUSB
 #	if ! HAVE_DECL_LIBUSB_ERROR_NAME
@@ -19,7 +21,33 @@
 
 #include <windows.h>
 
-#include "miner.h"  // for timersub
+#ifndef __maybe_unused
+#define __maybe_unused		__attribute__((unused))
+#endif
+
+  #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
+ #ifndef timeradd
+ # define timeradd(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 >= 1000000)			      \
+      {							      \
+	++(result)->tv_sec;				      \
+	(result)->tv_usec -= 1000000;			      \
+      }							      \
+   } while (0)
+ #endif
 
 static inline int nanosleep(const struct timespec *req, struct timespec *rem)
 {

driver-icarus.c

@@ -54,6 +54,7 @@
   #define HAVE_EPOLL
 #endif
 
+#include "compat.h"
 #include "dynclock.h"
 #include "elist.h"
 #include "icarus-common.h"

driver-modminer.c

@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "compat.h"
 #include "dynclock.h"
 #include "logging.h"
 #include "miner.h"

miner.h

@@ -71,32 +71,6 @@ static inline int fsync (int fd)
  #endif
 #endif
 
-#ifdef WIN32
-  #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
- #ifndef timeradd
- # define timeradd(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 >= 1000000)			      \
-      {							      \
-	++(result)->tv_sec;				      \
-	(result)->tv_usec -= 1000000;			      \
-      }							      \
-   } while (0)
- #endif
-#endif
-
 
 #ifdef HAVE_ADL
  #include "ADL/adl_sdk.h"
@@ -180,7 +154,9 @@ static inline int fsync (int fd)
 #define unlikely(expr) (expr)
 #define likely(expr) (expr)
 #endif
+#ifndef __maybe_unused
 #define __maybe_unused		__attribute__((unused))
+#endif
 
 #define uninitialised_var(x) x = x