An improved HAVE_MKDIR patch that compiles also with MinGW.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9385 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index ea2c834d204d2dce9f848485af609c6b36ad5d78..8b6e4fbb30549ab082b3cfe44e233048b21a21ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Angus Leeming  <leeming@lyx.org>
+
+       * configure.ac: remove the HAVE_MKDIR conditional code to
+       src/support/mkdir.C
+
 2004-12-15  Angus Leeming  <leeming-0hXrFu2P2+c@public.gmane.org>
 
        * configure.ac: add AC_FUNC_MKDIR test and code to

diff --git a/configure.ac b/configure.ac
index 08a27864893ddf44562c35a4bf24334daeb31f28..cdb0941a9e1c194f5976bd519363c9e13176f607 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -357,20 +357,6 @@ int mkstemp(char*);
 #endif
 #endif
 
-#if HAVE_MKDIR
-#  if MKDIR_TAKES_ONE_ARG
-     /* MinGW32 */
-#    define mkdir(a, b) mkdir(a)
-#  endif
-#else
-#  if HAVE__MKDIR
-     /* plain Windows 32 */
-#    define mkdir(a, b) _mkdir(a)
-#  else
-#    error "Don't know how to create a directory on this system."
-#  endif
-#endif
-
 #ifdef __EMX__
 #include "support/os2_defines.h"
 #endif

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index d766ceb165ca5f6aeb218f227959bacdad12906b..0587d5d46253e286a6b584f8ca1809778403436b 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Angus Leeming  <leeming@lyx.org>
+
+       * mkdir.C: move the HAVE_MKDIR conditional code out of config.h
+       and into here.
+
 2004-12-15  Angus Leeming  <leeming@lyx.org>
 
        * FileInfo.[Ch] (getNumberOfLinks): removed.

diff --git a/src/support/mkdir.C b/src/support/mkdir.C
index 21e4b0679c74bd18e2ce0da270acdbe8aec5a18b..cab93d0bad8dbeb1b05669f956f4826e26381525 100644 (file)
--- a/src/support/mkdir.C
+++ b/src/support/mkdir.C
@@ -20,5 +20,20 @@
 int lyx::support::mkdir(std::string const & pathname, unsigned long int mode)
 {
        // FIXME: why don't we have mode_t in lyx::mkdir prototype ??
+#if HAVE_MKDIR
+# if MKDIR_TAKES_ONE_ARG
+       // MinGW32
+       return ::mkdir(pathname.c_str());
+# else
+       // POSIX
        return ::mkdir(pathname.c_str(), mode_t(mode));
+# endif
+#else
+# if HAVE__MKDIR
+       // plain Windows 32
+       return ::_mkdir(pathname.c_str());
+# else
+#  error "Don't know how to create a directory on this system."
+# endif
+#endif
 }