diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-18 16:39:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-19 08:19:38 +0100 |
| commit | 697f01e052ae73e88d7e1a37386f2648d57e12e2 (patch) | |
| tree | 6dc879a6307ad905b909e0eb88bb143899806279 /stoc | |
| parent | Don't set autogen.sh KEY=VALUE arguments as environment variables (diff) | |
| download | core-697f01e052ae73e88d7e1a37386f2648d57e12e2.tar.gz core-697f01e052ae73e88d7e1a37386f2648d57e12e2.zip | |
SAL_W32 is just an alias for _WIN32
...so consistently use the latter instead of the former
Change-Id: I144d5e7c472632f93b2258461510346bc85892d9
Reviewed-on: https://gerrit.libreoffice.org/48135
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/implementationregistration/implreg.cxx | 2 | ||||
| -rw-r--r-- | stoc/source/security/permissions.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index a4a7f0beeca6..fd24918dd06d 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -47,7 +47,7 @@ #include "mergekeys.hxx" -#if defined(SAL_W32) +#if defined(_WIN32) #include <io.h> #else #include <unistd.h> diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 2854cf1319d1..f996df36bd15 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -332,7 +332,7 @@ FilePermission::FilePermission( getWorkingDir().pData, perm.URL.pData, &out.pData ); m_url = (osl_File_E_None == rc ? out : perm.URL); // fallback } -#ifdef SAL_W32 +#ifdef _WIN32 // correct win drive letters if (9 < m_url.getLength() && '|' == m_url[ 9 ]) // file:///X| { @@ -361,7 +361,7 @@ bool FilePermission::implies( Permission const & perm ) const if (demanded.m_allFiles) return false; -#ifdef SAL_W32 +#ifdef _WIN32 if (m_url.equalsIgnoreAsciiCase( demanded.m_url )) return true; #else @@ -375,7 +375,7 @@ bool FilePermission::implies( Permission const & perm ) const { // demanded url must start with granted path (including path trailing path sep) sal_Int32 len = m_url.getLength() -1; -#ifdef SAL_W32 +#ifdef _WIN32 return (0 == ::rtl_ustr_compareIgnoreAsciiCase_WithLength( demanded.m_url.pData->buffer, len, m_url.pData->buffer, len )); #else @@ -388,7 +388,7 @@ bool FilePermission::implies( Permission const & perm ) const { // demanded url must start with granted path (including path trailing path sep) sal_Int32 len = m_url.getLength() -1; -#ifdef SAL_W32 +#ifdef _WIN32 return ((0 == ::rtl_ustr_compareIgnoreAsciiCase_WithLength( demanded.m_url.pData->buffer, len, m_url.pData->buffer, len )) && (0 > demanded.m_url.indexOf( '/', len ))); // in addition, no deeper paths |