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 /sdext | |
| 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 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 12 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 |
2 files changed, 5 insertions, 15 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 69aa4d8f783b..ec8b6439dd10 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -18,9 +18,7 @@ */ -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #endif @@ -38,9 +36,7 @@ #include <rtl/alloc.h> // disable warnings again because someone along the line has enabled them -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #endif @@ -681,9 +677,7 @@ PDFEntry* PDFReader::read( const char* pFileName ) #endif // WIN32 } -#if defined __SUNPRO_CC -#pragma enable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(pop) #endif diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index b4b66a3f6dc3..7f14192f8ece 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -27,9 +27,7 @@ #include <boost/shared_array.hpp> -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #endif @@ -44,9 +42,7 @@ #include "UTF8.h" #endif -#if defined __SUNPRO_CC -#pragma enable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(pop) #endif |