diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-09 20:16:47 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-11-10 00:03:22 +0100 |
commit | f35b3fea46532ffc54e9026e7a953f64493e7525 (patch) | |
tree | 277cc9cea57beb6ddfc0c9bde5b25079ba1fb8fd /connectivity/source | |
parent | 20193bcc93660a1510a7cd5ab8d0897e55ee7546 (diff) |
clean up #ifdef ICC code
According to the dmake documentation, ICC refers to Visual Age C++ for
OS/2, which is not a supported compiler (or platform).
Change-Id: Ic9e23bc7c44de110a3a312bd007beda3b660927d
Diffstat (limited to 'connectivity/source')
-rw-r--r-- | connectivity/source/inc/odbc/OFunctiondefs.hxx | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index 87f4d5492e77..0af1d26470b3 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -52,56 +52,6 @@ //-------------------------------------------------------------------------- -#ifdef OS2__00 - -#ifdef ODBCIMP - -// Stub version: dynamic binding to the DLL at runtime. -// odbcstub defines the NSQL... methods used in the sources -// as indirect function calls. -// odbcimp uses preos2, odbc and postos2 itself. -// #include "odbc3imp.hxx" - -#else - -// Currently, we directly use the ODBC DLL from Watcom SQL (via the supplied lib) - -#ifndef ODBC_OS2 -#define ODBC_OS2 -#endif - -#include <svpm.h> -#include <odbc.h> -#define SQL_API __syscall -#ifndef SQL_MAX_MESSAGE_LENGTH -#define SQL_MAX_MESSAGE_LENGTH MAX_MESSAGE_LENGTH -#endif -#ifndef SQL_MAX_DSN_LENGTH -#define SQL_MAX_DSN_LENGTH MAX_DSN_LENGTH -#endif -#ifndef SQL_AUTOCOMMIT_ON -#define SQL_AUTOCOMMIT_ON 1UL -#endif -#ifndef SQL_AUTOCOMMIT_OFF -#define SQL_AUTOCOMMIT_OFF 0UL -#endif - -#define SQL_FETCH_PRIOR SQL_FETCH_PREV -#define SQL_NO_TOTAL (-4) - -#endif - -// The ODBC.h from Watcom expects char*, not UCHAR* usually used with ODBC -#if defined( ICC ) -#define SDB_ODBC_CHAR unsigned char -#else -#define SDB_ODBC_CHAR char -#endif - -#endif - -//-------------------------------------------------------------------------- - #ifdef UNX // Currently, we directly use the ODBC shared library from Q+E (via the supplied lib) |