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 /sal | |
| 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 'sal')
| -rw-r--r-- | sal/cppunittester/cppunittester.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_old_test_file.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index fa0c57934e45..7bc32f8db3c7 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -247,7 +247,7 @@ public: manager.load(testlib, args); } catch (const CppUnit::DynamicLibraryManagerException &e) { std::cerr << "DynamicLibraryManagerException: \"" << e.what() << "\"\n"; -#ifdef WIN32 +#ifdef _WIN32 const char *pPath = getenv ("PATH"); if (pPath && strlen (pPath) > 256) { diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 8444baf70f04..8db4b25823b7 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -52,7 +52,7 @@ public: CPPUNIT_TEST_SUITE_END( ); }; -#ifndef WIN32 +#ifndef _WIN32 const char * const aSource1[] = { "a" , "file:///" TEST_VOLUME "bla/a", @@ -87,7 +87,7 @@ using ::rtl::OString; void oldtestfile::test_file_001() { -#ifndef WIN32 +#ifndef _WIN32 OUString base1( "file:///" TEST_VOLUME "bla" ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) @@ -106,7 +106,7 @@ void oldtestfile::test_file_001() void oldtestfile::test_file_002() { -#ifndef WIN32 +#ifndef _WIN32 OUString base2( "file:///" TEST_VOLUME "bla/blubs/schnubbel" ); int i; for( i = 0 ; aSource2[i] ; i +=2 ) @@ -125,7 +125,7 @@ void oldtestfile::test_file_002() void oldtestfile::test_file_004() { -#ifndef WIN32 +#ifndef _WIN32 OUString base4( "file:///" TEST_VOLUME "bla/" ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) |