diff options
| author | Hennes Rohling <hro@openoffice.org> | 2002-08-19 07:39:39 +0000 |
|---|---|---|
| committer | Hennes Rohling <hro@openoffice.org> | 2002-08-19 07:39:39 +0000 |
| commit | 4682179695d0d528fc3cda164e6cf94f112681b6 (patch) | |
| tree | 3ce6b17b5f1975ac5d53b77adc765d7cfff91fa3 /sal | |
| parent | cc52ae4420ce0a32ccba07a6eb0ac385caad5b05 (diff) | |
#100821# Added osl_getTempDirURL
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/MAKEFILE.MK | 8 | ||||
| -rw-r--r-- | sal/osl/w32/profile.c | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/MAKEFILE.MK index 564c0f3d3aee..bed097d4391f 100644 --- a/sal/osl/w32/MAKEFILE.MK +++ b/sal/osl/w32/MAKEFILE.MK @@ -2,9 +2,9 @@ # # $RCSfile: MAKEFILE.MK,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hro $ $Date: 2002-06-24 16:20:02 $ +# last change: $Author: hro $ $Date: 2002-08-19 08:39:39 $ # # Copyright according the GNU Public License. # @@ -49,7 +49,7 @@ SLOFILES= $(SLO)$/conditn.obj \ $(SLO)$/pipe.obj \ $(SLO)$/util.obj \ $(SLO)$/dir.obj \ - $(SLO)$/dirw9x.obj + $(SLO)$/tempfile.obj OBJFILES= $(OBJ)$/conditn.obj \ @@ -71,7 +71,7 @@ OBJFILES= $(OBJ)$/conditn.obj \ $(OBJ)$/pipe.obj \ $(OBJ)$/util.obj \ $(OBJ)$/dir.obj \ - $(OBJ)$/dirw9x.obj + $(OBJ)$/tempfile.obj .ENDIF diff --git a/sal/osl/w32/profile.c b/sal/osl/w32/profile.c index 715da482d2ec..1b506f71e1c6 100644 --- a/sal/osl/w32/profile.c +++ b/sal/osl/w32/profile.c @@ -2,9 +2,9 @@ * * $RCSfile: profile.c,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hro $ $Date: 2002-08-14 11:21:20 $ + * last change: $Author: hro $ $Date: 2002-08-19 08:39:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,6 @@ #include "system.h" -#include "dirw9x.h" #include <osl/diagnose.h> #include <osl/profile.h> @@ -1062,7 +1061,7 @@ sal_Bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, else if ((rtl_ustr_ascii_compare_WithLength(pPath, RTL_CONSTASCII_LENGTH(STR_INI_METASYS), STR_INI_METASYS) == 0) && ((nLen == RTL_CONSTASCII_LENGTH(STR_INI_METASYS)) || (pPath[RTL_CONSTASCII_LENGTH(STR_INI_METASYS)] == '/'))) { - if (((nPathLen = GetWindowsDirectory(wcsPath, MAX_PATH)) == 0) || (nPathLen >= MAX_PATH)) + if (((nPathLen = GetWindowsDirectoryW(wcsPath, MAX_PATH)) == 0) || (nPathLen >= MAX_PATH)) return (sal_False); if (nLen > RTL_CONSTASCII_LENGTH(STR_INI_METASYS)) |