Mercurial > gub
view patches/openoffice-connectivity-mingw.patch @ 6512:ccc20ae889ca default tip guix
mingw::guile-2.0.7 builds.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Thu, 24 Mar 2016 08:03:39 +0100 |
| parents | abeb272c37c6 |
| children |
line wrap: on
line source
--- connectivity/source/inc/odbc/OFunctiondefs.hxx.~1.17.~ 2008-04-10 13:43:33.000000000 +0200 +++ connectivity/source/inc/odbc/OFunctiondefs.hxx 2008-10-31 15:24:26.000000000 +0100 @@ -32,7 +32,14 @@ #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_ #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_ -#if defined(WIN) || defined(WNT) +#if defined(__MINGW32__) + +#include <windows.h> +#define SDB_ODBC_CHAR SQLCHAR +#include <odbcinst.h> +#include <sqlext.h> + +#elif defined(WIN) || defined(WNT) #ifdef _MSC_VER #pragma warning(push) --- connectivity/source/inc/adabas/BDriver.hxx.~1.13.~ 2008-04-10 12:43:47.000000000 +0200 +++ connectivity/source/inc/adabas/BDriver.hxx 2008-10-31 15:24:26.000000000 +0100 @@ -31,6 +31,8 @@ #ifndef _CONNECTIVITY_ADABAS_BDRIVER_HXX_ #define _CONNECTIVITY_ADABAS_BDRIVER_HXX_ +#include <sal/types.h> + #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> --- connectivity/source/inc/TResultSetHelper.hxx.~1.3.~ 2008-04-10 12:39:57.000000000 +0200 +++ connectivity/source/inc/TResultSetHelper.hxx 2008-10-31 15:24:26.000000000 +0100 @@ -33,6 +33,9 @@ #include <sal/types.h> +#undef ABSOLUTE +#undef RELATIVE + namespace connectivity { class SAL_NO_VTABLE IResultSetHelper --- connectivity/inc/connectivity/sdbcx/VDescriptor.hxx.~1.11.~ 2008-04-10 09:43:29.000000000 +0200 +++ connectivity/inc/connectivity/sdbcx/VDescriptor.hxx 2008-10-31 15:24:26.000000000 +0100 @@ -32,6 +32,7 @@ #define _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_ #include <comphelper/propertycontainer.hxx> +#undef OPTIONAL #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/typeprovider.hxx>