[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basebmp/source comphelper/inc connectivity/source cppu/source

[Pedro Giffuni]

 basebmp/source/makefile.mk                       |    2 +-
 comphelper/inc/comphelper/locale.hxx             |    8 ++++++++
 connectivity/source/drivers/odbcbase/ODriver.cxx |   10 +++++-----
 cppu/source/uno/data.cxx                         |    4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 0e8321653ebd24157f3d6bfb256ebcfe737d17a8
Author: Pedro Giffuni <pfg at apache.org>
Date:   Wed Nov 25 17:29:09 2015 +0000

    i125362 - Illumos port: consider GCC for some Sun Studio specifics
    
    Patch by: Alexander Pyhalov

diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
index 656a63c..d9b09ea 100644
--- a/basebmp/source/makefile.mk
+++ b/basebmp/source/makefile.mk
@@ -51,7 +51,7 @@ CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_P
 
 # SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail 
 # if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
+.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
 # For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
 .IF "$(CCNUMVER)"!="00050005"
 CDEFS+=-xalias_level=compatible
commit e1da117c49fc02af9543e32526bf1c04657534c4
Author: Pedro Giffuni <pfg at apache.org>
Date:   Wed Nov 25 16:55:51 2015 +0000

    i125711 - Illumos port: generalize MAX_ALIGNMENT for Solaris
    
    GCC in Ilumos appears to behave exactly like the Solaris SUNPRO
    compiler so generalize the case for Solaris.

diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 2465c47..be4e381 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -356,8 +356,8 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 #endif
 
 #if defined(INTEL) \
-    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2)) || defined(MACOSX) \
-        || defined(__SUNPRO_CC) && defined(SOLARIS))
+    && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \
+        || defined(OS2)) || defined(MACOSX) ||  defined(SOLARIS))
 #define MAX_ALIGNMENT_4
 #endif
 
commit 22235c6a730fe80013f248124957cd7186232c8f
Author: Pedro Giffuni <pfg at apache.org>
Date:   Wed Nov 25 16:47:34 2015 +0000

    i125369 - Illumos port: avoid some redefinitions
    
    In the case of the Illumos/Solaris-i386 port there are some
    conflicts caused by internal C definitions. Try to work them
    out with some help of Illumos' opengrok.
    
    On the case of the odbcbase driver rename the affected typedef
    to avoid conflicts.

diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx
index 4ea878e..c98386a 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.hxx
@@ -31,6 +31,14 @@
 #include <rtl/ustring.hxx>
 #include "comphelper/comphelperdllapi.h"
 
+// These are specified by i386 ABI suppl. but
+// only affect Solaris i386/illumos so far.
+
+#if !defined(_XPG4_2) || defined(__EXTENSIONS__)
+#undef  CS
+#undef  ES
+#endif
+
 //_______________________________________________
 // namespace
 
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 8bbfeeb..cdb8e66 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -69,11 +69,11 @@ rtl::OUString ODBCDriver::getImplementationName_Static(  ) throw(RuntimeExceptio
         // Please take care when changing it.
 }
 
-typedef Sequence< ::rtl::OUString > SS;
+typedef Sequence< ::rtl::OUString > SSEQ;
 //------------------------------------------------------------------------------
-SS ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+SSEQ ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
-    SS aSNS( 1 );
+    SSEQ aSNS( 1 );
     aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
     return aSNS;
 }
@@ -87,7 +87,7 @@ SS ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 //------------------------------------------------------------------
 sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
 {
-    SS aSupported(getSupportedServiceNames());
+    SSEQ aSupported(getSupportedServiceNames());
     const ::rtl::OUString* pSupported = aSupported.getConstArray();
     const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
@@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString& _rServiceN
 }
 
 //------------------------------------------------------------------
-SS SAL_CALL ODBCDriver::getSupportedServiceNames(  ) throw(RuntimeException)
+SSEQ SAL_CALL ODBCDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }