fix mingw compatibility

only enable backtraces for platforms we know support it
aka mac OS-X and Linux.
can be extended later.

diff --git a/programs/fileio.c b/programs/fileio.c
index 5f6b12e51394c3a7c1c49de51b5c0ccfd7b5013e..e08920ba8f0a92557621366cfb99e27760a13557 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -20,6 +20,9 @@
 #  define _POSIX_SOURCE 1          /* disable %llu warnings with MinGW on Windows */
 #endif
 
+#if  defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+#  define BACKTRACES_ENABLE 1
+#endif
 
 /*-*************************************
 *  Includes
@@ -31,8 +34,8 @@
 #include <string.h>     /* strcmp, strlen */
 #include <errno.h>      /* errno */
 #include <signal.h>
-#ifndef _WIN32
-#include <execinfo.h>   /* backtrace, backtrace_symbols */
+#ifdef BACKTRACES_ENABLE
+#  include <execinfo.h>   /* backtrace, backtrace_symbols */
 #endif
 
 #if defined (_MSC_VER)
@@ -162,9 +165,10 @@ static void clearHandler(void)
 /*-*********************************************************
 *  Termination signal trapping (Print debug stack trace)
 ***********************************************************/
+#ifdef BACKTRACES_ENABLE
+
 #define MAX_STACK_FRAMES    50
 
-#ifndef _WIN32
 static void ABRThandler(int sig) {
     const char* name;
     void* addrlist[MAX_STACK_FRAMES];
@@ -202,7 +206,7 @@ static void ABRThandler(int sig) {
 
 void FIO_addAbortHandler()
 {
-#ifndef _WIN32
+#ifdef BACKTRACES_ENABLE
     signal(SIGABRT, ABRThandler);
     signal(SIGFPE, ABRThandler);
     signal(SIGILL, ABRThandler);

diff --git a/programs/util.h b/programs/util.h
index 8993bf964fd933eeb0e898bcaf48a3fb0ca132c0..e8288b8fe35fd2c8fe1b8cff46d879081e30fc15 100644 (file)
--- a/programs/util.h
+++ b/programs/util.h
@@ -170,7 +170,11 @@ static int g_utilDisplayLevel;
         return ((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom);
     }
 
-#elif (PLATFORM_POSIX_VERSION >= 200112L) && (defined __UCLIBC__ || ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) || __GLIBC__ > 2))
+#elif (PLATFORM_POSIX_VERSION >= 200112L) \
+   && (defined(__UCLIBC__)                \
+      || (defined(__GLIBC__)              \
+          && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) \
+             || (__GLIBC__ > 2))))
 
     #define UTIL_TIME_INITIALIZER { 0, 0 }
     typedef struct timespec UTIL_freq_t;