corrections to directory management for Mac OS X

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index eb535c74c7eeb880d435c65e41f8b3d82e871cf1..de1b5eb30126f3f52490ec5eae91611010ce318e 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -67,7 +67,7 @@
 
 #endif // __WXPM__
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
 #include "moreextr.h"
 #endif
 
@@ -597,7 +597,7 @@ void wxGenericDirCtrl::SetupSections()
         }
     }
 #endif
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)
     FSSpec volume ;
     short index = 1 ;
     while(1) {