diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2016-01-04 22:45:26 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-01-05 00:01:42 +0000 |
| commit | 9eb319944604f17839c8e0ee03bad876df82b53e (patch) | |
| tree | e66dcdf58c918fab081af9c4469be09aadb8d788 /unotools | |
| parent | 27953088c5fc8a51cb5c26b0746cb42f56324404 (diff) | |
let us try to use the pid as well on windows
I'm a bit worried that some of our random test failures are related to
trying to reuse the same temp file in different tests.
Change-Id: I0ca4ace088a96530e6a62d01f979fefe63822b22
Reviewed-on: https://gerrit.libreoffice.org/21090
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 177c29374406..c2534f671ff7 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -38,6 +38,8 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#elif defined( WNT ) +#include <process.h> #endif using namespace osl; @@ -298,6 +300,10 @@ OUString CreateTempName_Impl( const OUString* pParent, bool bKeep, bool bDir = t static const OUString aPidString = OUString::number(pid); aEyeCatcher += aPidString; #endif +#elif defined(WNT) + static const int pid = _getpid(); + static const OUString aPidString = OUString::number(pid); + aEyeCatcher += aPidString; #endif UniqueTokens t; return lcl_createName(aEyeCatcher, t, nullptr, pParent, bDir, bKeep, false); |