[or-cvs] [torsocks/osx] Fix compilation in 64-bit OSX.

[mwenge@xxxxxxxx]

Author: mwenge <robert@xxxxxxxxxxxxxxx>
Date: Sat, 19 Sep 2009 19:08:17 +0100
Subject: Fix compilation in 64-bit OSX.
Commit: f9e89711f516977b56cdfa30489ff75233b2fdaf

---
 src/tsocks.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/tsocks.c b/src/tsocks.c
index 2acfccc..4f84fed 100644
--- a/src/tsocks.c
+++ b/src/tsocks.c
@@ -53,7 +53,16 @@
 /*Defining _NONSTD_SOURCE causes library and kernel calls to behave as closely
 to Mac OS X 10.3's library and kernel calls as possible.*/
 #if defined(__APPLE__) || defined(__darwin__)
+/*
+From 'man compat' in OSX:
+64-BIT COMPILATION
+     When compiling for 64-bit architectures, the __LP64__ macro will be defined to 1, and UNIX conformance
+     is always on (the _DARWIN_FEATURE_UNIX_CONFORMANCE macro will also be defined to the SUS conformance
+     level).  Defining _NONSTD_SOURCE will cause a compilation error.
+*/
+#if !defined(__LP64__)
 #define _NONSTD_SOURCE 1
+#endif
 #include <sys/socket.h>
 #endif
 
-- 
1.5.6.5