#if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
# include <fcntl.h>
-# include <sys/stat.h>
+# ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+# endif
+# ifdef HAVE_IO_H
+# include <io.h>
+# endif
+# ifdef HAVE_PROCESS_H
+# include <process.h>
+# endif
#endif
using boost::scoped_array;
#elif defined(HAVE_MKTEMP)
// This probably just barely works...
::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);
+# else
+# error No open() function.
+# endif
#else
#error FIX FIX FIX
#endif
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)
+ tmpfl += convert<string>(_getpid());
+#else
+# error No getpid() function
+#endif
tmpfl += "XXXXXX";
// The supposedly safe mkstemp version
int const tmpf = make_tempfile(tmpl.get());
if (tmpf != -1) {
string const t(tmpl.get());
+#if defined (HAVE_CLOSE)
::close(tmpf);
+#elif defined (HAVE__CLOSE)
+ ::_close(tmpf);
+#else
+# error No close() function.
+#endif
lyxerr[Debug::FILES] << "Temporary file `" << t
<< "' created." << endl;
return t;