fdo#72598 Remove SunStudio cruft from code base

Change-Id: Ia6799c852eb95d496fbc8dcfdabde62dffc263a6
Reviewed-on: https://gerrit.libreoffice.org/7066
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

17 files changed, 8 insertions, 75 deletions

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 15d8eb896eec..ba9a847bc48c 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -379,17 +379,11 @@ inline void SAL_CALL cppu_ext_getMapping(
 //##################################################################################################
 //##################################################################################################
 
-#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
-static OUString * s_pStaticOidPart = 0;
-#endif
-
 // environment init stuff
 //--------------------------------------------------------------------------------------------------
 inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 {
-#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
     static OUString * s_pStaticOidPart = 0;
-#endif
     if (! s_pStaticOidPart)
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
@@ -404,12 +398,8 @@ inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
             {
                 aRet.append( (sal_Int32)ar[i], 16 );
             }
-#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500))
-            s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
-#else
             static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
             s_pStaticOidPart = &s_aStaticOidPart;
-#endif
         }
     }
     return *s_pStaticOidPart;
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index a7d2e22d133f..bacd9a721348 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -41,15 +41,13 @@ namespace bridges { namespace cpp_uno { namespace shared {
 
 namespace {
 
-#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \
-    || (defined(__GNUC__) && defined(__APPLE__))
+#if (defined(__GNUC__) && defined(__APPLE__))
 static OUString * s_pStaticOidPart = 0;
 #endif
 
 const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 {
-#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \
-    || (defined(__GNUC__) && defined(__APPLE__)))
+#if ! (defined(__GNUC__) && defined(__APPLE__))
     static OUString * s_pStaticOidPart = 0;
 #endif
     if (! s_pStaticOidPart)
@@ -66,8 +64,7 @@ const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
             {
                 aRet.append( (sal_Int32)ar[i], 16 );
             }
-#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) \
-    || (defined(__GNUC__) && defined(__APPLE__))
+#if (defined(__GNUC__) && defined(__APPLE__))
             s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
 #else
             static OUString s_aStaticOidPart(
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 35b2f2c8acf5..e511627d5d54 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -56,13 +56,6 @@ void dso_exit(void) {
     }
 }
 
-#ifdef __SUNPRO_CC
-# pragma init(dso_init)
-# pragma fini(dso_exit)
-#endif
-
-
-
 namespace {
 
 struct InitVtableFactory {
diff --git a/chart2/inc/GL/glew.h b/chart2/inc/GL/glew.h
index 51a29ef8b910..421fc17893dd 100644
--- a/chart2/inc/GL/glew.h
+++ b/chart2/inc/GL/glew.h
@@ -236,8 +236,6 @@ typedef _W64 int ptrdiff_t;
 #else
 #  if defined(__GNUC__) && __GNUC__>=4
 #   define GLEWAPI extern __attribute__ ((visibility("default")))
-#  elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#   define GLEWAPI extern __global
 #  else
 #   define GLEWAPI extern
 #  endif
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index 50a1288de251..0311aa830e73 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
@@ -32,10 +32,6 @@
 #include "nsXPIDLString.h"
 
 #include "nsString.h"
-#if defined __SUNPRO_CC
-#pragma disable_warn
-    // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
-#endif
 
 #include "nsDirectoryService.h"
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 8b1a3024383d..6cf4e4d9f395 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
@@ -45,10 +45,6 @@
 #include "nsISupports.h"
 #include "nsIRegistry.h"
 #include "nsString.h"
-#if defined __SUNPRO_CC
-#pragma disable_warn
-    // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
-#endif
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIDirectoryService.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index b6d9c2eae82c..432ec63712a3 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
@@ -22,10 +22,6 @@
 #include "nsIDirectoryService.h"
 #include "nsILocalFile.h"
 #include "nsString.h"
-#if defined __SUNPRO_CC
-#pragma disable_warn
-    // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
-#endif
 
 #include "post_include_mozilla.h"
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index 4320c9320edd..4bd051175087 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
@@ -22,10 +22,6 @@
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsString.h"
-#if defined __SUNPRO_CC
-#pragma disable_warn
-    // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
-#endif
 #include "nsIRegistry.h"
 #include "nsXPIDLString.h"
 #include "nsVoidArray.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 8d8c2001e6e4..f8fea6b4368e 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
@@ -22,10 +22,6 @@
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsString.h"
-#if defined __SUNPRO_CC
-#pragma disable_warn
-    // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
-#endif
 #include "nsIRegistry.h"
 #include "nsXPIDLString.h"
 #include "nsVoidArray.h"
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index 1d452159dd51..9073f4546c38 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
@@ -34,10 +34,6 @@
 #include <nsISupportsArray.h>
 #include <nsString.h>
 
-#if defined __SUNPRO_CC
-#pragma disable_warn
-    // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
-#endif
 #include <nsMemory.h>
 #include <prtypes.h>
 #include <nsRDFCID.h>
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index 20753f4a0e5b..9bb7b6513313 100644
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
@@ -20,8 +20,6 @@
 #if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
     && !defined __clang__
 #pragma GCC diagnostic pop
-#elif defined __SUNPRO_CC
-#pragma enable_warn
 #elif defined _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index 14a7ad6c8038..17b4b02c82ff 100644
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -52,8 +52,6 @@
     && !defined __clang__
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#elif defined __SUNPRO_CC
-    #pragma disable_warn
 #elif defined _MSC_VER
     #pragma warning(push, 1)
     #pragma warning(disable:4946 4710)
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index bdc76bd89277..39e3010369a4 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -46,9 +46,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/macros.h>
 
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable:4273 4701)
 #endif
@@ -4811,8 +4809,6 @@ int OSQLParser::SQLlex()
 	return s_pScanner->SQLlex();
 }
 
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 4cc6e0c46ea8..573cadd2144a 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -46,9 +46,7 @@
 #include <connectivity/sqlparse.hxx>
 #include <connectivity/sqlscan.hxx>
 
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(push, 1)
 /**/
 #ifdef yywrap
@@ -811,8 +809,6 @@ sal_Int32 OSQLScanner::SQLlex()
 	return SQLyylex();
 }
 
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index da3853e3d161..b31cabc09e31 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -210,9 +210,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) {
 }
 
 // Suppress any warnings from generated code:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4273 4701 4702)
 #endif
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index ba6f4d6a1016..7519a7b5ab6e 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -246,8 +246,6 @@ static void parseLineAndFile(sal_Char* pBuf)
 #if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunused-label"
-#elif defined __SUNPRO_CC
-#pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 /**/
diff --git a/sal/osl/unx/security.c b/sal/osl/unx/security.c
index 82f97a95e6fc..2be082644507 100644
--- a/sal/osl/unx/security.c
+++ b/sal/osl/unx/security.c
@@ -18,12 +18,7 @@
  */
 
 #include <stddef.h>
-
-/* Solaris 8 has no C99 stdint.h, and Solaris generally seems not to miss it for
-   SIZE_MAX: */
-#if !defined __SUNPRO_C
 #include <stdint.h>
-#endif
 
 #include "system.h"