diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:22:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:22:18 +0000 |
| commit | 160b86e84e7640f04ea3dc88a3cba75431b510fa (patch) | |
| tree | 52f420011f818c70d8ca7113d598d2cf65fa7aa5 /connectivity | |
| parent | 8d556f18a62f7b91e58e76df87c61dbf82187b84 (diff) | |
INTEGRATION: CWS ooo20040704 (1.9.222); FILE MERGED
2004/07/09 21:39:49 rene 1.9.222.2: #i23779# Patch to use system libs
- remove unneeded AC_MSG_CHECKING's
- rename system{_,-}odbc / SYSTEM_ODBC to
system{_,-}odbc{_,-}headers / SYSTEM_ODBC_HEADERS
- regenerate configure
2004/06/28 13:54:23 cmc 1.9.222.1: #i30801# allow using system stl if possible
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/inc/odbc/OFunctiondefs.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index 006da69f25b9..984f358aee9a 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -2,9 +2,9 @@ * * $RCSfile: OFunctiondefs.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: oj $ $Date: 2001-02-13 10:41:38 $ + * last change: $Author: rt $ $Date: 2004-09-08 16:22:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,7 +168,11 @@ #endif #define CALLBACK #define EXPORT +#ifdef SYSTEM_ODBC_HEADERS +#include <sqlext.h> +#else #include <odbc/sqlext.h> +#endif #undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal // definiert. |