openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1716482 - in /openoffice/trunk/main: comphelper/inc/comphelper/locale.hxx connectivity/source/drivers/odbcbase/ODriver.cxx
Date Wed, 25 Nov 2015 16:47:34 GMT
Author: pfg
Date: Wed Nov 25 16:47:34 2015
New Revision: 1716482

URL: http://svn.apache.org/viewvc?rev=1716482&view=rev
Log:
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.

Modified:
    openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx
    openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx

Modified: openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx?rev=1716482&r1=1716481&r2=1716482&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx (original)
+++ openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx Wed Nov 25 16:47:34 2015
@@ -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
 

Modified: openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx?rev=1716482&r1=1716481&r2=1716482&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx (original)
+++ openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx Wed Nov 25 16:47:34
2015
@@ -69,11 +69,11 @@ rtl::OUString ODBCDriver::getImplementat
 		// 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_
 //------------------------------------------------------------------
 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::supportsSe
 }
 
 //------------------------------------------------------------------
-SS SAL_CALL ODBCDriver::getSupportedServiceNames(  ) throw(RuntimeException)
+SSEQ SAL_CALL ODBCDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
 	return getSupportedServiceNames_Static();
 }



Mime
View raw message