#5304 daemon fails to build on mac

diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj
index 5ac55b4129498d4aa4c9304120805673e72282c8..4f485933cf919526f9f309ff0b8bfaf8564a9c42 100644 (file)
--- a/Transmission.xcodeproj/project.pbxproj
+++ b/Transmission.xcodeproj/project.pbxproj
@@ -3274,7 +3274,11 @@
                                GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREPROCESSOR_DEFINITIONS = MACOSX;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       MACOSX,
+                                       BUILD_MAC_CLIENT,
+                                       XCODE_BUILD,
+                               );
                                GCC_UNROLL_LOOPS = YES;
                                GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -3395,6 +3399,8 @@
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        MACOSX,
                                        NS_BLOCK_ASSERTIONS,
+                                       BUILD_MAC_CLIENT,
+                                       XCODE_BUILD,
                                );
                                GCC_UNROLL_LOOPS = YES;
                                GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -3451,7 +3457,11 @@
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREPROCESSOR_DEFINITIONS = MACOSX;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       MACOSX,
+                                       BUILD_MAC_CLIENT,
+                                       XCODE_BUILD,
+                               );
                                GCC_UNROLL_LOOPS = YES;
                                GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;

diff --git a/configure.ac b/configure.ac
index 6e057bd4c9299d4264fe13f9fdd383491563a043..bffe16e7545b30215a9c6b373d2a7f1c05870770 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -474,6 +474,7 @@ AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
 
 
 if test "x$build_mac" = "xyes" ; then
+   AC_DEFINE([BUILD_MAC_CLIENT], 1)
     # Make sure the proper Mac SDK is installed
     if test ! -d /Developer/SDKs/MacOSX10.5.sdk; then
       cat << EOF

diff --git a/libtransmission/platform.c b/libtransmission/platform.c
index 6a2a7b750faf7eb0da15449f25ad02daa80201c2..a6c856f64e260710c7d28692701bbc69182f76d5 100644 (file)
--- a/libtransmission/platform.c
+++ b/libtransmission/platform.c
@@ -28,7 +28,7 @@
  #include <windows.h>
  #include <shlobj.h> /* for CSIDL_APPDATA, CSIDL_MYDOCUMENTS */
 #else
- #ifdef SYS_DARWIN
+ #ifdef BUILD_MAC_CLIENT
   #include <CoreFoundation/CoreFoundation.h>
  #endif
  #ifdef __HAIKU__
@@ -429,7 +429,7 @@ tr_getWebClientDir (const tr_session * session UNUSED)
       else
         {
 
-#ifdef SYS_DARWIN /* on Mac, look in the Application Support folder first, then in the app bundle. */
+#ifdef BUILD_MAC_CLIENT /* on Mac, look in the Application Support folder first, then in the app bundle. */
 
           /* Look in the Application Support folder */
           s = tr_buildPath (tr_sessionGetConfigDir (session), "web", NULL);

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index e05f917586d5a14d9183a0f7981c255ad90e6ee1..af51fdbc4ee1737993d85213736d46dec3ac2315 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -14,7 +14,7 @@
  #define _GNU_SOURCE /* glibc's string.h needs this to pick up memmem */
 #endif
 
-#if defined (SYS_DARWIN)
+#if defined (XCODE_BUILD)
  #define HAVE_GETPAGESIZE
  #define HAVE_ICONV_OPEN
  #define HAVE_MKDTEMP