[tor-commits] [torsocks/master] compat: Fix bad use of defined macro for OS X

[dgoulet at torproject.org]

commit b2905208add1e77cedd8bcdf00645dde8348163a
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Sun Oct 16 13:01:58 2016 -0400

    compat: Fix bad use of defined macro for OS X
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/common/compat.h | 2 +-
 src/common/log.h    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index 2d766e3..0eb4fda 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -194,7 +194,7 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
 #define TSOCKS_NR_GETPEERNAME SYS_getpeername
 #define TSOCKS_NR_LISTEN    SYS_listen
 #define TSOCKS_NR_RECVMSG   SYS_recvmsg
-#ifdef !defined(__darwin__)
+#if !defined(__darwin__)
 #define TSOCKS_NR_SCHED_GETAFFINITY SYS_sched_getaffinity
 #endif /* ! __darwin__ */
 
diff --git a/src/common/log.h b/src/common/log.h
index a2b0293..e3770df 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -74,7 +74,9 @@ void log_destroy(void);
  */
 #define _PERROR(fmt, args...) _ERRMSG("PERROR", MSGERR, fmt, ## args)
 
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+#if !defined(__linux__) || \
+	((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || \
+	!defined(__GLIBC__)
 
 /*
  * Version using XSI strerror_r.