conditional compilation corrections for Apple Developer Tools

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 96e20cfc3d9a42d6da920a578e10d8e54d9c796e..f234da74566aafab7c5d7154d2e14f432e5ca34a 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -27,8 +27,10 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "morefile.h"
-#include "moreextr.h"
+#ifndef __DARWIN__
+#  include "morefile.h"
+#  include "moreextr.h"
+#endif
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
@@ -347,6 +349,7 @@ char *wxGetUserHome (const wxString& user)
 }
 #endif
 
+#ifndef __DARWIN__
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )
@@ -380,6 +383,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     return err == noErr ;
 }
+#endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 96e20cfc3d9a42d6da920a578e10d8e54d9c796e..f234da74566aafab7c5d7154d2e14f432e5ca34a 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -27,8 +27,10 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "morefile.h"
-#include "moreextr.h"
+#ifndef __DARWIN__
+#  include "morefile.h"
+#  include "moreextr.h"
+#endif
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
@@ -347,6 +349,7 @@ char *wxGetUserHome (const wxString& user)
 }
 #endif
 
+#ifndef __DARWIN__
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )
@@ -380,6 +383,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     return err == noErr ;
 }
+#endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.