From f30f5bd933910df65d2283a1c458e14ed7b0b439 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 6 Apr 2000 12:59:20 +0000
Subject: [PATCH] wxMkdir/Rmdir clash fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/filefn.h   | 8 ++++----
 src/common/filefn.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 7301cc6d5a..3c31ff8c8e 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -81,16 +81,16 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
         #define   wxOpen       _wopen
         #define   wxAccess     _waccess
 
-        #define   wxMkdir      _wmkdir
-        #define   wxRmdir      _wrmdir
+        #define   wxMkDir      _wmkdir
+        #define   wxRmDir      _wrmdir
 
         #define   wxStat       _wstat
     #else // !wxUSE_UNICODE
         #define   wxOpen       _open
         #define   wxAccess     _access
 
-        #define   wxMkdir      _mkdir
-        #define   wxRmdir      _rmdir
+        #define   wxMkDir      _mkdir
+        #define   wxRmDir      _rmdir
 
         #define   wxStat       _stat
     #endif
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 52b5a9e23c..6d779fe86a 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1083,7 +1083,7 @@ bool wxMkdir(const wxString& dir, int perm)
 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dir, NULL)) != 0) // enhance for EAB's??
 #else  // !MSW and !OS/2 VAC++
-    if ( wxMkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
@@ -1108,7 +1108,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 #ifdef __SALFORDC__
   return FALSE; // What to do?
 #else
-  return (wxRmdir(wxFNSTRINGCAST dir.fn_str()) == 0);
+  return (wxRmDir(wxFNSTRINGCAST dir.fn_str()) == 0);
 #endif
 
 #endif