Consistent use of preprocessor guards;

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index d80e3b9795f7a2fd4f69233773bb506206b37e05..18699223a6b1952f48e4b9857c3ce65b09e57c3b 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -11,20 +11,25 @@
 #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>
-# include <sys/stat.h>
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
 #endif
 
 using boost::scoped_array;
@@ -53,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