diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2000-08-22 21:27:49 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2000-08-22 21:27:49 +0000 |
| commit | bee5b60a229c8e0e92d20c60f9355f3a55f9b4c7 (patch) | |
| tree | e0ca3cc1e73e6bb92a7614b8ed72c214789d9e7d /ext/odbc/php_odbc.h | |
| parent | ae49ebf19881753d171fb546b2cfa5998f0846b6 (diff) | |
| download | php-git-bee5b60a229c8e0e92d20c60f9355f3a55f9b4c7.tar.gz | |
cleaned up the PHP/SOLID integration code, and corrected some minor assumptions on my part for the 3.5 EE systems. also removed a series of warnings on builds within the ODBC functions, and corrected header order. include of the SS_LINUX and SS_FBX defines, needed to make solid headers completely happy with the wchar.h situation.
THIS DOES NOT FIX BUG ID #4615
Diffstat (limited to 'ext/odbc/php_odbc.h')
| -rw-r--r-- | ext/odbc/php_odbc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index ea24b6550a..1809fe52b3 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -47,10 +47,10 @@ #if !defined(PHP_WIN32) #include <sqlunix.h> #endif - #include <sql.h> #include <sqltypes.h> #include <sqlucode.h> #include <sqlext.h> + #include <sql.h> #endif #undef HAVE_SQL_EXTENDED_FETCH PHP_FUNCTION(solid_fetch_prev); @@ -220,6 +220,9 @@ typedef struct odbc_connection { #if defined( HAVE_IBMDB2 ) || defined( HAVE_UNIXODBC ) SQLHANDLE henv; SQLHANDLE hdbc; +#elif defined( HAVE_SOLID_35 ) + SQLHENV henv; + SQLHDBC hdbc; #else HENV henv; HDBC hdbc; @@ -238,6 +241,8 @@ typedef struct odbc_result_value { typedef struct odbc_result { #if defined( HAVE_IBMDB2 ) || defined( HAVE_UNIXODBC ) SQLHANDLE stmt; +#elif defined( HAVE_SOLID_35 ) + SQLHSTMT stmt; #else HSTMT stmt; #endif @@ -281,6 +286,8 @@ int odbc_bindcols(odbc_result *result); #if defined( HAVE_IBMDB2 ) || defined( HAVE_UNIXODBC ) #define ODBC_SQL_ERROR_PARAMS SQLHANDLE henv, SQLHANDLE conn, SQLHANDLE stmt, char *func +#elif defined( HAVE_SOLID_35 ) +#define ODBC_SQL_ERROR_PARAMS SQLHENV henv, SQLHDBC conn, SQLHSTMT stmt, char *func #else #define ODBC_SQL_ERROR_PARAMS HENV henv, HDBC conn, HSTMT stmt, char *func #endif |