[tor-commits] [torsocks/master] Make sure __darwin__ is defined

dgoulet at torproject.org dgoulet at torproject.org
Fri Apr 4 22:40:26 UTC 2014


commit 6c589a8d181546f02092b3b599be660cc08c35ff
Author: Luke Gallagher <luke at hypergeometric.net>
Date:   Fri Aug 30 09:23:22 2013 +1000

    Make sure __darwin__ is defined
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/common/compat.h |    4 ++++
 src/common/ref.h    |    2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/common/compat.h b/src/common/compat.h
index a433339..18404b2 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -18,6 +18,10 @@
 #ifndef TORSOCKS_COMPAT_H
 #define TORSOCKS_COMPAT_H
 
+#if (defined(__APPLE__) && defined(__MACH__) && !defined(__darwin__))
+#define __darwin__	1
+#endif
+
 #if (defined(__linux__) || defined(__FreeBSD__) || defined(__darwin__))
 
 #define RTLD_NEXT	((void *) -1)
diff --git a/src/common/ref.h b/src/common/ref.h
index aa0cc90..c7b878f 100644
--- a/src/common/ref.h
+++ b/src/common/ref.h
@@ -20,6 +20,8 @@
 
 #include <assert.h>
 
+#include "compat.h"
+
 struct ref {
 	long count;
 };





More information about the tor-commits mailing list