diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:13:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:38:33 +0100 |
| commit | 0cee740c95496210d62206a21e8bc9adebf4fa4d (patch) | |
| tree | 4a1ff295046962418b30ac244314dfee5fb92fb5 /sal/qa/osl | |
| parent | b170265a6bba70faf1cb4172834586f4f45dd2bf (diff) | |
replace #ifdef SOLARIS with #ifdef __sun
Check for a macro that is defined by the compiler, we don't really need
one defined by the build system.
Change-Id: Iccb8e3198396881395c97a6b81690ebe64b7e9d2
Diffstat (limited to 'sal/qa/osl')
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File_Const.h | 2 | ||||
| -rw-r--r-- | sal/qa/osl/process/osl_Thread.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index ae4243b4b25d..1cffa3010ea7 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1605,7 +1605,7 @@ namespace osl_FileStatus void getFileType_007() { -#if defined ( SOLARIS ) //Special file is differ in Windows +#if defined(__sun) //Special file is differ in Windows nError1 = ::osl::DirectoryItem::get( aTypeURL2, m_aSpecialItem ); CPPUNIT_ASSERT_EQUAL( nError1, ::osl::FileBase::E_None ); @@ -4783,7 +4783,7 @@ namespace osl_Directory deleteTestDirectory( aTmpName3 ); ::rtl::OString sError = "test for remove function: try to remove a directory that is not empty."; sError += errorToStr( nError1 ).getStr(); -#if defined ( SOLARIS ) +#if defined(__sun) //on UNX, the implementation uses rmdir(), which EEXIST is thrown on Solaris when the directory is not empty, refer to: 'man -s 2 rmdir', while on linux, ENOTEMPTY is thrown. //EEXIST The directory contains entries other than those for "." and "..". printf("#Solaris test\n"); diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index cd39fb4e0202..b8c7e123107e 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -163,7 +163,7 @@ OUString aTypeURL3( FILE_PREFIX "" ); #if ( defined UNX ) // Unix OUString aVolURL1( FILE_PREFIX ""); //ufs Solaris/Linux -#ifdef SOLARIS +#ifdef __sun OUString aVolURL2( FILE_PREFIX "dev/fd" ); //fd Solaris #else OUString aVolURL2( FILE_PREFIX "dev/floppy/0u1440" ); //fd0 Linux diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 24f8daccd9f8..3353b2e93e90 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -1339,7 +1339,7 @@ namespace osl_Thread } CPPUNIT_TEST_SUITE(setPriority); -#ifndef SOLARIS +#ifndef __sun CPPUNIT_TEST(setPriority_002); CPPUNIT_TEST(setPriority_003); CPPUNIT_TEST(setPriority_004); @@ -1374,7 +1374,7 @@ namespace osl_Thread ThreadHelper::outputPriority(aPriority); // LLA: Priority settings may not work within some OS versions. -#if defined(_WIN32) || defined(SOLARIS) +#if defined(_WIN32) || defined(__sun) CPPUNIT_ASSERT_MESSAGE( "getPriority", aPriority == osl_Thread_PriorityHighest |