removed compiler warnings about assignments in logical expressions

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index bf8103304c2fb59aa2ac2483d5c1fc2808dba1d9..a4cefd642a0ab7823f120543afbbbda280fdeace 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -797,12 +797,12 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 
   bool ret = file.Commit();
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   if ( ret )
   {
        FSSpec spec ;
        
-       wxUnixFilename2FSSpec( m_strLocalFile , &spec ) ;
+       wxMacFilename2FSSpec( m_strLocalFile , &spec ) ;
        FInfo finfo ;
        if ( FSpGetFInfo( &spec , &finfo ) == noErr )
        {
@@ -811,7 +811,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
                FSpSetFInfo( &spec , &finfo ) ;
        }
   }
-#endif // __WXMAC__
+#endif // __WXMAC__ && !__UNIX__
 
 #ifdef __UNIX__
   // restore the old umask if we changed it