diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2001-03-13 11:45:16 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2001-03-13 11:45:16 +0000 |
| commit | acdf5a4f008b371bf3efdeab78252041d3fc1e21 (patch) | |
| tree | 37c2019d2d0243b20d24b342a56239d3e7dac826 /rdbmaker/source/codemaker | |
| parent | 461f336dc589cb3eff7a2fd18d1acb9cafa7ea1d (diff) | |
remove vos dependencies
Diffstat (limited to 'rdbmaker/source/codemaker')
| -rw-r--r-- | rdbmaker/source/codemaker/global.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx index 863195124..a8e8120a3 100644 --- a/rdbmaker/source/codemaker/global.cxx +++ b/rdbmaker/source/codemaker/global.cxx @@ -2,9 +2,9 @@ * * $RCSfile: global.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2000-11-06 17:46:57 $ + * last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,14 +58,14 @@ * * ************************************************************************/ -#ifndef _VOS_PROCESS_HXX_ -#include <vos/process.hxx> +#ifndef _OSL_PROCESS_H_ +#include <osl/process.h> #endif -#ifndef _RTL_OSTRINGBUFFER_HXX_ -#include <rtl/strbuf.hxx> +#ifndef _RTL_OSTRINGBUFFER_HXX_ +#include <rtl/strbuf.hxx> #endif -#ifndef _RTL_USTRING_HXX_ -#include <rtl/ustring.hxx> +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> #endif #include <stdlib.h> @@ -86,7 +86,6 @@ #include <codemaker/global.hxx> #endif -using namespace vos; using namespace rtl; OString makeTempName(sal_Char* prefix) @@ -103,13 +102,11 @@ OString makeTempName(sal_Char* prefix) if (prefix) pPrefix = prefix; - OStartupInfo StartupInfo; - - if (StartupInfo.getEnvironment(uTMP, uPattern) != OStartupInfo::E_None) + if ( osl_getEnvironment(uTMP.pData, &uPattern.pData) != osl_Process_E_None ) { - if (StartupInfo.getEnvironment(uTEMP, uPattern) != OStartupInfo::E_None) + if ( osl_getEnvironment(uTEMP.pData, &uPattern.pData) != osl_Process_E_None ) { -#if defined(WIN32) || defined(WNT) || defined(OS2) +#if defined(SAL_W32) || defined(SAL_OS2) strcpy(tmpPattern, "."); #else strcpy(tmpPattern, "/tmp"); |