hopefully fix tex2lyx linking.

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 6d44e42f67aae5d8a02e5bdf0548af946a9b31a5..3f3c6e222c330aaade4e4646fa778735b37f9287 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -22,8 +22,6 @@
 
 #include <cstdlib>
 
-
-namespace lyx {
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -46,6 +44,8 @@ using boost::scoped_array;
 using std::string;
 using std::endl;
 
+namespace lyx {
+
 namespace {
 
 inline
@@ -55,7 +55,7 @@ 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
@@ -63,7 +63,7 @@ int make_tempfile(char * templ)
 # endif
        return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 # elif defined (HAVE__OPEN)
-       return _open(templ,
+       return ::_open(templ,
                       _O_RDWR | _O_CREAT | _O_EXCL,
                       _S_IREAD | _S_IWRITE);
 # else
@@ -99,11 +99,11 @@ 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
-# error No close() function.
+# error No x() function.
 #endif
                lyxerr[Debug::FILES] << "Temporary file `" << t
                                     << "' created." << endl;