diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-12-16 20:28:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-16 20:52:39 +0000 |
| commit | 66397a4fd222757a8bd651c0c297615319eac4a5 (patch) | |
| tree | f84d3cc35ccf23bdcf148cc86835bbb9932350e6 /include/sal | |
| parent | Allow setting environment value directly in .component files (diff) | |
| download | core-66397a4fd222757a8bd651c0c297615319eac4a5.tar.gz core-66397a4fd222757a8bd651c0c297615319eac4a5.zip | |
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I5150eec33228e18e274a8ae4effd3f185851b7f4
Reviewed-on: https://gerrit.libreoffice.org/7103
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/sal')
| -rw-r--r-- | include/sal/types.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/sal/types.h b/include/sal/types.h index 57789142c563..cc042464e8e4 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -88,7 +88,7 @@ typedef unsigned char sal_uInt8; #define SAL_PRIuUINT64 "I64u" #define SAL_PRIxUINT64 "I64x" #define SAL_PRIXUINT64 "I64X" -#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined (__GNUC__) || defined (sgi) +#elif defined (__GNUC__) || defined (sgi) #if SAL_TYPES_SIZEOFLONG == 8 typedef signed long int sal_Int64; typedef unsigned long int sal_uInt64; @@ -250,19 +250,7 @@ typedef void * sal_Handle; # define SAL_CALL __cdecl # define SAL_CALL_ELLIPSE __cdecl #elif defined SAL_UNX -# if defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550) -# define SAL_DLLPUBLIC_EXPORT __global -# define SAL_JNI_EXPORT __global -# define SAL_DLLPUBLIC_IMPORT -# define SAL_DLLPRIVATE __hidden -# define SAL_DLLPUBLIC_TEMPLATE -# elif defined(__SUNPRO_C ) && (__SUNPRO_C >= 0x550) -# define SAL_DLLPUBLIC_EXPORT __global -# define SAL_JNI_EXPORT __global -# define SAL_DLLPUBLIC_IMPORT -# define SAL_DLLPRIVATE __hidden -# define SAL_DLLPUBLIC_TEMPLATE -# elif defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) +# if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) # if defined(DISABLE_DYNLOADING) # define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility("hidden"))) # define SAL_JNI_EXPORT __attribute__ ((visibility("default"))) |