MSVC compilation fix.

[lyx.git] / src / support / tempname.C

diff --git a/src/support/tempname.C b/src/support/tempname.C
index afad6dedcfa1853e510b1f208c2fbaa869fa3bd4..6d44e42f67aae5d8a02e5bdf0548af946a9b31a5 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -21,6 +21,9 @@
 #include <boost/scoped_array.hpp>
 
 #include <cstdlib>
+
+
+namespace lyx {
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -52,13 +55,17 @@ int make_tempfile(char * templ)
        return ::mkstemp(templ);
 #elif defined(HAVE_MKTEMP)
        // This probably just barely works...
-       ::mktemp(templ);
+       mktemp(templ);
 # if defined (HAVE_OPEN)
+# if (!defined S_IRUSR)
+#   define S_IRUSR S_IREAD
+#   define S_IWUSR S_IWRITE
+# endif
        return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 # elif defined (HAVE__OPEN)
-       return ::_open(templ,
-                      _O_RDWR | _O_CREAT | _O_EXCL,
-                      _S_IREAD | _S_IWRITE);
+       return _open(templ,
+                      _O_RDWR | _O_CREAT | _O_EXCL,
+                      _S_IREAD | _S_IWRITE);
 # else
 #  error No open() function.
 # endif
@@ -73,7 +80,7 @@ int make_tempfile(char * templ)
 string const lyx::support::tempName(string const & dir, string const & mask)
 {
        string const tmpdir(dir.empty() ? package().temp_dir() : dir);
-       string tmpfl(AddName(tmpdir, mask));
+       string tmpfl(addName(tmpdir, mask));
 #if defined (HAVE_GETPID)
        tmpfl += convert<string>(getpid());
 #elif defined (HAVE__GETPID)
@@ -92,7 +99,7 @@ string const lyx::support::tempName(string const & dir, string const & mask)
        if (tmpf != -1) {
                string const t(tmpl.get());
 #if defined (HAVE_CLOSE)
-               ::close(tmpf);
+               close(tmpf);
 #elif defined (HAVE__CLOSE)
                ::_close(tmpf);
 #else
@@ -108,3 +115,6 @@ string const lyx::support::tempName(string const & dir, string const & mask)
                return string();
        }
 }
+
+
+} // namespace lyx