diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2000-06-30 19:22:52 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2000-06-30 19:22:52 +0000 |
| commit | 5f81cba573567d2241a851bb160296dc8c67f0d6 (patch) | |
| tree | b5dd37e342fab0ca74707015250ad20dcb6ff15d /ext/odbc/php_odbc.h | |
| parent | 353dcc835fee5acf2aeefda28a5f50f9a75b3f28 (diff) | |
| download | php-git-5f81cba573567d2241a851bb160296dc8c67f0d6.tar.gz | |
updates for the SolidEE to work for 3.5 with PHP4.0.1. Still causes warning of "integer from pointer used without typecast" but does not seem to effect the final build any. have not found a correction yet. has not shown the SQLParamData bug either, but unknown if it is closed as i was unable to reproduce it.
basically fixed the config.m4 file, and added a #define of HAVE_SOLID_35, due to the solidee 3.5 vs all other solidee systems being drastically different. and solidtech providing no means for testing what version you are using.
does not include fixes for the linux users of glibc2 (automatically assumes libc5). temporary work around, link your /usr/local/solid/lib files from a scll2x23 or scll2x30 to a scllux30 or scllux23 name... suggestions to automate this are welcome.
Diffstat (limited to 'ext/odbc/php_odbc.h')
| -rw-r--r-- | ext/odbc/php_odbc.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index 199edc4974..ad87e3c410 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -45,11 +45,24 @@ /* checking in the same order as in configure.in */ -#ifdef HAVE_SOLID /* Solid Server */ +#if defined(HAVE_SOLID) || defined(HAVE_SOLID_35) /* Solid Server */ #define ODBC_TYPE "Solid" -#include <cli0core.h> -#include <cli0ext1.h> +#if defined(HAVE_SOLID) + #include <cli0core.h> + #include <cli0ext1.h> + /*the following help for SOLID 3.0 */ + #include <cli0cli.h> + #include <cli0env.h> +#elif defined(HAVE_SOLID_35) + #if !defined(PHP_WIN32) + #include <sqlunix.h> + #endif + #include <sql.h> + #include <sqltypes.h> + #include <sqlucode.h> + #include <sqlext.h> +#endif #undef HAVE_SQL_EXTENDED_FETCH PHP_FUNCTION(solid_fetch_prev); #define SQLSMALLINT SWORD @@ -194,11 +207,11 @@ PHP_FUNCTION(odbc_binmode); PHP_FUNCTION(odbc_longreadlen); PHP_FUNCTION(odbc_tables); PHP_FUNCTION(odbc_columns); -#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) /* not supported now */ +#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_35) /* not supported now */ PHP_FUNCTION(odbc_columnprivileges); PHP_FUNCTION(odbc_tableprivileges); #endif -#if !defined(HAVE_SOLID) /* not supported */ +#if !defined(HAVE_SOLID) || !defined(HAVE_SOLID_35) /* not supported */ PHP_FUNCTION(odbc_foreignkeys); PHP_FUNCTION(odbc_procedures); PHP_FUNCTION(odbc_procedurecolumns); |