diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-12-16 22:27:05 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2013-12-17 11:57:04 +0000 |
| commit | 417c85bf582e0d1dbabb7b0f16d60a394d537e61 (patch) | |
| tree | 3e306d6e2cc7f6f65d006786167a042e3b5ec237 /sal | |
| parent | 4e89311f5c863d667ea69d4c074f7409f5563dab (diff) | |
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I6f75d0df0ddafc892fef0ce1bfdcdd6c70151afc
Reviewed-on: https://gerrit.libreoffice.org/7104
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/system.c | 3 | ||||
| -rw-r--r-- | sal/workben/measure_oustrings.cxx | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c index 23e4f8c77fd7..a50996a66dde 100644 --- a/sal/osl/unx/system.c +++ b/sal/osl/unx/system.c @@ -305,9 +305,6 @@ int osl_isSingleCPU = 0; #if defined(_SC_NPROCESSORS_CONF) /* i.e. MACOSX for Intel doesn't have this */ #if defined(__GNUC__) void osl_interlockedCountCheckForSingleCPU(void) __attribute__((constructor)); -#elif defined(__SUNPRO_C) -void osl_interlockedCountCheckForSingleCPU(void); -#pragma init (osl_interlockedCountCheckForSingleCPU) #endif void osl_interlockedCountCheckForSingleCPU(void) diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx index 2baf92f4a313..8372f49d4fea 100644 --- a/sal/workben/measure_oustrings.cxx +++ b/sal/workben/measure_oustrings.cxx @@ -33,8 +33,6 @@ int COUNT = 10000000; #ifdef HAVE_CXX_Ox # define SAL_DECLARE_UTF16(str) u ## str -#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) -# define SAL_DECLARE_UTF16(str) U ## str #elif __SIZEOF_WCHAR_T__ == 2 # define SAL_DECLARE_UTF16(str) L ## str #endif |