CVS update: php31/ext/odbc

Date: Saturday October 17, 1998 @ 17:19 Author: shane Update of /repository/php31/ext/odbc In directory asf:/u2/tmp/cvs-serv283/ext/odbc Modified Files: php3_unified_odbc.h Log Message: last misc updates of modules from 3.0 to 3.1 Index: php31/ext/odbc/php3_unified_odbc.h diff -c php31/ext/odbc/php3_unified_odbc.h:2.2 php31/ext/odbc/php3_unified_odbc.h:2.3 *** php31/ext/odbc/php3_unified_odbc.h:2.2 Tue Aug 11 14:22:32 1998 --- php31/ext/odbc/php3_unified_odbc.h Sat Oct 17 17:19:14 1998 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php3_unified_odbc.h,v 2.2 1998/08/11 18:22:32 shane Exp $ */ #ifndef _UNIFIED_ODBC_H #define _UNIFIED_ODBC_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php3_unified_odbc.h,v 2.3 1998/10/17 21:19:14 shane Exp $ */ #ifndef _UNIFIED_ODBC_H #define _UNIFIED_ODBC_H *************** *** 82,87 **** --- 82,88 ---- #define PHP3_UODBC_FIELD_LEN php3_uodbc_field_len #define PHP3_UODBC_FIELD_NAME php3_uodbc_field_name #define PHP3_UODBC_FIELD_TYPE php3_uodbc_field_type + #define PHP3_UODBC_FIELD_NUM php3_uodbc_field_num #define PHP3_UODBC_FREE_RESULT php3_uodbc_free_result #define PHP3_UODBC_NUM_FIELDS php3_uodbc_num_fields #define PHP3_UODBC_NUM_ROWS php3_uodbc_num_rows *************** *** 123,128 **** --- 124,130 ---- #define ODBC_FIELD_LEN "odbc_field_len" #define ODBC_FIELD_NAME "odbc_field_name" #define ODBC_FIELD_TYPE "odbc_field_type" + #define ODBC_FIELD_NUM "odbc_field_num" #define ODBC_FREE_RESULT "odbc_free_result" #define ODBC_NUM_FIELDS "odbc_num_fields" #define ODBC_NUM_ROWS "odbc_num_rows" *************** *** 356,362 **** # include <cli0ext1.h> # define HAVE_SQL_EXTENDED_FETCH 0 extern void php3_solid_fetch_prev(INTERNAL_FUNCTION_PARAMETERS); ! # elif HAVE_IODBC && !(WIN32|WINNT) # include <isql.h> # include <isqlext.h> # include <odbc_types.h> --- 358,364 ---- # include <cli0ext1.h> # define HAVE_SQL_EXTENDED_FETCH 0 extern void php3_solid_fetch_prev(INTERNAL_FUNCTION_PARAMETERS); ! # elif HAVE_IODBC && !MSVC5 # include <isql.h> # include <isqlext.h> # include <odbc_types.h> *************** *** 369,388 **** # define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) # define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET) ! # elif HAVE_VELOCIS /* Nothing ??? */ # define UNIX # define HAVE_SQL_EXTENDED_FETCH 1 # include <sql.h> # include <sqlext.h> ! # elif WIN32|WINNT # define HAVE_SQL_EXTENDED_FETCH 1 ! # include <windows.h> # include <sql.h> # include <sqlext.h> # endif ! # if !(WIN32|WINNT) # define FAR # endif --- 371,403 ---- # define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) # define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET) ! #elif HAVE_OPENLINK ! ! # include <iodbc.h> ! # include <isql.h> ! # include <isqlext.h> ! # include <udbcext.h> ! # define HAVE_SQL_EXTENDED_FETCH 1 ! ! #elif HAVE_VELOCIS /* Nothing ??? */ # define UNIX # define HAVE_SQL_EXTENDED_FETCH 1 # include <sql.h> # include <sqlext.h> ! ! #elif HAVE_CODBC ! # define HAVE_SQL_EXTENDED_FETCH 1 ! # include <odbc.h> ! ! # else # define HAVE_SQL_EXTENDED_FETCH 1 ! # include <WINDOWS.H> # include <sql.h> # include <sqlext.h> # endif ! # ifndef MSVC5 # define FAR # endif *************** *** 410,415 **** --- 425,431 ---- extern void PHP3_UODBC_FIELD_LEN(INTERNAL_FUNCTION_PARAMETERS); extern void PHP3_UODBC_FIELD_NAME(INTERNAL_FUNCTION_PARAMETERS); extern void PHP3_UODBC_FIELD_TYPE(INTERNAL_FUNCTION_PARAMETERS); + extern void PHP3_UODBC_FIELD_NUM(INTERNAL_FUNCTION_PARAMETERS); extern void PHP3_UODBC_FREE_RESULT(INTERNAL_FUNCTION_PARAMETERS); extern void PHP3_UODBC_NUM_FIELDS(INTERNAL_FUNCTION_PARAMETERS); extern void PHP3_UODBC_NUM_ROWS(INTERNAL_FUNCTION_PARAMETERS); *************** *** 460,466 **** int defConn; int le_result, le_conn, le_pconn; long defaultlrl; ! int defaultbinmode; HashTable *resource_list; HashTable *resource_plist; } UODBC_MODULE; --- 476,482 ---- int defConn; int le_result, le_conn, le_pconn; long defaultlrl; ! long defaultbinmode; HashTable *resource_list; HashTable *resource_plist; } UODBC_MODULE; -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net