From 619e0d43b19948edf1d1098eb5f2cbc768f74762 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Wed, 29 Aug 2001 18:49:19 +0000 Subject: [PATCH] conditional compilation corrections for Apple Developer Tools git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/utils.cpp | 8 ++++++-- src/mac/utils.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 96e20cfc3d..f234da7456 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -27,8 +27,10 @@ #include #include -#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 96e20cfc3d..f234da7456 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -27,8 +27,10 @@ #include #include -#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. -- 2.45.2