diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /tools | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qa/cppunit/test_urlobj.cxx | 12 | ||||
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index ef61d4a2150e..dce5cc112480 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -62,7 +62,7 @@ namespace tools_urlobj == "smb://10.10.1.1/sampledir/sample.file" ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::Smb ); #endif -#ifdef WIN +#ifdef _WIN32 CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). equalsAscii ( "file://10.10.1.1/sampledir/sample.file" ) ); @@ -89,7 +89,7 @@ namespace tools_urlobj == "smb://137.65.170.24/c$/Img0001.jpg" ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::Smb ); #endif -#ifdef WIN +#ifdef _WIN32 CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). equalsAscii( "file://137.65.170.24/c$/Img0001.jpg" ) ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::File ); @@ -115,7 +115,7 @@ namespace tools_urlobj == "smb://hive-winxp-x86/pmladek/test2.odt" ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::Smb ); #endif -#ifdef WIN +#ifdef _WIN32 CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). equalsAscii( "file://hive-winxp-x86/pmladek/test2.odt" ) ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::File ); @@ -134,7 +134,7 @@ namespace tools_urlobj == "smb://10.10.1.1/sampledir/sample.file" ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::Smb ); #endif -#ifdef WIN +#ifdef _WIN32 CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). equalsAscii( "file://10.10.1.1/sampledir/sample.file" ) ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::File ); @@ -158,7 +158,7 @@ namespace tools_urlobj == "smb://137.65.170.24/c$/Img0001.jpg" ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::Smb ); #endif -#ifdef WIN +#ifdef _WIN32 CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). equalsAscii( "file://137.65.170.24/c$/Img0001.jpg" ) ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::File ); @@ -183,7 +183,7 @@ namespace tools_urlobj == "smb://hive-winxp-x86/pmladek/test2.odt" ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::Smb ); #endif -#ifdef WIN +#ifdef _WIN32 CPPUNIT_ASSERT( aUrl.GetMainURL( INetURLObject::NO_DECODE ). equalsAscii( "file://hive-winxp-x86/pmladek/test2.odt" ) ); CPPUNIT_ASSERT( aUrl.GetProtocol( ) == INetProtocol::File ); diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 03e550e96421..57e73e4805cc 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1440,7 +1440,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, } #endif -#ifdef WIN +#ifdef _WIN32 if (m_eScheme==INetProtocol::Smb) { // Change "smb://server/path" URIs to "file://server/path" // URIs on Windows, since Windows doesn't understand the |