another safety belt

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 8a7785cc1adf7dc0e5fc70c22dcaac0464776cc2..f15ec1a6f0d63fc38a93e6a2eb9cb69b5dd1b930 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -6,6 +6,7 @@
 #include "LString.h"
 #include "support/lyxlib.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "debug.h"
 #include "os.h"
 
@@ -15,20 +16,16 @@ using std::endl;
 namespace {
 
 inline
-int make_tempfile(char * templ) 
+int make_tempfile(char * templ)
 {
-#ifdef HAVE_MKSTEMP
+#if defined(HAVE_MKSTEMP)
        return ::mkstemp(templ);
-#else
-#ifdef HAVE_MKTEMP
+#elif defined(HAVE_MKTEMP)
        // This probably just barely works...
        ::mktemp(templ);
        return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 #else
-#ifdef WITH_WARNINGS
-#warning FIX FIX FIX
-#endif
-#endif
+#error FIX FIX FIX
 #endif
 }
 
@@ -46,7 +43,7 @@ string const lyx::tempName(string const & dir, string const & mask)
        char * tmpl = new char[tmpfl.length() + 1]; // + 1 for '\0'
        tmpfl.copy(tmpl, string::npos);
        tmpl[tmpfl.length()] = '\0'; // terminator
-       
+
        int const tmpf = make_tempfile(tmpl);
        if (tmpf != -1) {
                string const t(tmpl);