diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-20 14:17:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-20 14:17:24 +0000 |
| commit | 8bf63536c365cb0886482893dceea280f4f68494 (patch) | |
| tree | 647b78b7e28bbb1604190b4d624ba7d172a2b375 /psprint | |
| parent | 6606262839dc850c1559d41ae821820b53784e3e (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.5.4.3-1.5.4.3.2.1) -> HEAD
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/printergfx/printerjob.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/psprint/source/printergfx/printerjob.cxx b/psprint/source/printergfx/printerjob.cxx index 05d2c94a2065..5ec5f0dd7410 100644 --- a/psprint/source/printergfx/printerjob.cxx +++ b/psprint/source/printergfx/printerjob.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printerjob.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: cp $ $Date: 2002-04-08 16:38:40 $ + * last change: $Author: hr $ $Date: 2002-08-20 15:17:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,9 +83,12 @@ #ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif -#ifdef SOLARIS +#if defined(SOLARIS) || defined(IRIX) #include <alloca.h> #endif +#ifdef MACOSX +#include <unxmacxp_protos.h> +#endif #include <stdio.h> #include <sys/types.h> @@ -95,7 +98,6 @@ #include <algorithm> - using namespace psp ; // forward declaration @@ -346,7 +348,11 @@ createSpoolDir () } /* create a subdirectory in the tmp directory */ +#ifdef MACOSX + char* pName = macxp_tempnam( pTmpDir, "psp" ); +#else char* pName = tempnam (pTmpDir, "psp"); +#endif rtl::OUString aSubDir = rtl::OUString::createFromAscii (pName); rtl::OUString aUNCSubDir; osl::File::getFileURLFromSystemPath (aSubDir, aUNCSubDir); |