fixed crash in iconv_close() as well

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index a6107188c9419f6b6a9ac5a516b255d9ed5609eb..e976daf434c03c9fbb24a314d26733540e8c9059 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -46,6 +46,10 @@
 
 #include  "wx/utils.h"    // for wxGetHomeDir
 
 
 #include  "wx/utils.h"    // for wxGetHomeDir
 

+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+

 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation
 #if       defined(__WXMSW__) && !defined(_WINDOWS_)
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation
 #if       defined(__WXMSW__) && !defined(_WINDOWS_)


@@ -840,8 +844,7 @@ bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
   {
     return FALSE;
   }
   {
     return FALSE;
   }

-
-  return str.ToLong(pl);
+  return str.ToLong(pl) ;

 }
 
 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
 }
 
 bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)