X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..c48926e149739055b0ed978d9e893f7898a51a73:/src/mac/carbon/dirmac.cpp?ds=inline

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index e37f079382..36835cd68c 100644
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -36,11 +36,11 @@
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
   #include <windows.h>
 #endif
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#ifndef __DARWIN__
   #include "morefile.h"
   #include "moreextr.h"
   #include "fullpath.h"
@@ -113,12 +113,12 @@ wxDirData::wxDirData(const wxString& dirname)
 
 	FSSpec fsspec ;
 
-	wxUnixFilename2FSSpec( m_dirname , &fsspec ) ;
+	wxMacFilename2FSSpec( m_dirname , &fsspec ) ;
 	m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
 	m_CPB.hFileInfo.ioNamePtr = m_name ;
 	m_index = 0 ;
 
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
 	// TODO: what are we supposed to do for Mac OS X
 #else
 	FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;