X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ftempname.C;h=18699223a6b1952f48e4b9857c3ce65b09e57c3b;hb=aabd481ab63fd50606dd0d984c0b407e4b27e6a7;hp=8c6480bdbcf2b9830a59c5b0f32090ff8604a0ed;hpb=b049f3997abd18c6961f4a2d52e6766077cde91d;p=lyx.git

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 8c6480bdbc..18699223a6 100644
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -11,16 +11,26 @@
 #include <config.h>
 
 #include "support/lyxlib.h"
+
+#include "support/convert.h"
 #include "support/filetools.h"
-#include "support/tostr.h"
-#include "support/os.h"
+#include "support/package.h"
 
 #include "debug.h"
 
 #include <boost/scoped_array.hpp>
 
 #include <cstdlib>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
+# include <fcntl.h>
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
+#endif
 
 using boost::scoped_array;
 
@@ -48,9 +58,9 @@ int make_tempfile(char * templ)
 
 string const lyx::support::tempName(string const & dir, string const & mask)
 {
-	string const tmpdir(dir.empty() ? os::getTmpDir() : dir);
+	string const tmpdir(dir.empty() ? package().temp_dir() : dir);
 	string tmpfl(AddName(tmpdir, mask));
-	tmpfl += tostr(getpid());
+	tmpfl += convert<string>(getpid());
 	tmpfl += "XXXXXX";
 
 	// The supposedly safe mkstemp version