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 /extensions | |
| parent | remove executable bit from .mk files (diff) | |
| download | core-0cee740c95496210d62206a21e8bc9adebf4fa4d.tar.gz core-0cee740c95496210d62206a21e8bc9adebf4fa4d.zip | |
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 'extensions')
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 4 | ||||
| -rw-r--r-- | extensions/workben/testcomponent.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 5c23f182ad02..79a875b08a85 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -103,7 +103,7 @@ inline OUString getBuildId() } -#if defined LINUX || defined SOLARIS +#if (defined LINUX || defined __sun) inline OUString getBaseInstallation() { OUString aPathVal("$BRAND_BASE_DIR"); @@ -889,7 +889,7 @@ UpdateCheck::install() OUString aParameter; sal_Int32 nFlags = c3s::SystemShellExecuteFlags::DEFAULTS; -#if ( defined LINUX || defined SOLARIS ) +#if (defined LINUX || defined __sun) nFlags = 42; aParameter = getBaseInstallation(); if( !aParameter.isEmpty() ) diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 47eedfa23669..e9bed4c909b4 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -43,7 +43,7 @@ using ::rtl::OWStringToOString; // Needed to switch on solaris threads -#ifdef SOLARIS +#ifdef __sun extern "C" void ChangeGlobalInit(); #endif @@ -54,7 +54,7 @@ int SAL_CALL main (int argc, char **argv) printf( "usage : testcomponent service dll [additional dlls]\n" ); exit( 0 ); } -#ifdef SOLARIS +#ifdef __sun // switch on threads in solaris ChangeGlobalInit(); #endif |