diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 14:37:01 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 14:37:01 +0000 |
| commit | d1571f12a39db6a0eae46450a28ba665129a0165 (patch) | |
| tree | 032552eb98ad89f81288f9017e118d34ca61f764 /sal | |
| parent | edb896d16c218926b5e107d06e4dadadce4d6a51 (diff) | |
CWS-TOOLING: integrate CWS mingwport24
2009-09-13 02:15:22 +0200 tono r276097 : i#105033: mingw port: accept incomplete deflib
2009-09-12 15:14:34 +0200 tono r276096 : i#105012: mingw port: $(PATH) should be quoted
2009-09-12 15:12:49 +0200 tono r276095 : i#105011: mingw port: berkeleydb fix
2009-09-12 15:11:39 +0200 tono r276094 : i#105010: mingw port: decline libdl
2009-09-12 15:10:21 +0200 tono r276093 : i#105009: mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
2009-09-12 15:08:27 +0200 tono r276092 : reverting changes to revise log messages
2009-09-12 11:55:48 +0200 tono r276090 : i#105014: mingw port: change to latest w32api and mingw runtime
2009-09-12 11:52:12 +0200 tono r276089 : i#105013: mingw port: fix gas error in call.s in bridges
2009-09-12 11:42:04 +0200 tono r276088 : mingw port: should be quoted
2009-09-12 11:35:35 +0200 tono r276087 : mingw port: berkeleydb fix
2009-09-12 11:32:34 +0200 tono r276086 : mingw port: decline libdl
2009-09-12 11:20:50 +0200 tono r276085 : mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/file_dirvol.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 53aa1c40cd2b..5ea839ae215d 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -45,6 +45,9 @@ #include "rtl/ustring.hxx" #include <tchar.h> +#ifdef __MINGW32__ +#include <ctype.h> +#endif //##################################################### #define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0]))) @@ -718,9 +721,9 @@ oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath) sal_Int32 nLen = rtl_uString_getLength( strSysPath ); if ( - ( pBuffer[0] >= 'A' && pBuffer[0] <= 'Z' || - pBuffer[0] >= 'a' && pBuffer[0] <= 'z' ) && - pBuffer[1] == ':' && ( nLen ==2 || nLen == 3 && pBuffer[2] == '\\' ) + ( ( pBuffer[0] >= 'A' && pBuffer[0] <= 'Z' ) || + ( pBuffer[0] >= 'a' && pBuffer[0] <= 'z' ) ) && + pBuffer[1] == ':' && ( nLen ==2 || ( nLen == 3 && pBuffer[2] == '\\' ) ) ) SetLastError( ERROR_ALREADY_EXISTS ); @@ -1151,8 +1154,8 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path) { // determines if a volume mount point shows to a floppy // disk by comparing the unique volume names - static const LPWSTR FLOPPY_A = L"A:\\"; - static const LPWSTR FLOPPY_B = L"B:\\"; + static const LPCWSTR FLOPPY_A = L"A:\\"; + static const LPCWSTR FLOPPY_B = L"B:\\"; rtl::OUString p(path); osl::systemPathEnsureSeparator(p); @@ -1177,7 +1180,7 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path) //################################################ static bool is_floppy_drive(const rtl::OUString& path) { - static const LPWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb"); + static const LPCWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb"); // we must take into account that even a floppy // drive may be mounted to a directory so checking |