cvs: php4(PHP_4_3) /ext/odbc config.m4 php_odbc.c php_odbc.h

sniper Thu May 1 20:40:35 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/odbc config.m4 php_odbc.c php_odbc.h Log: MFH: - Fixed bug #22580 (ext/odbc compile failure with dbmaker) Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.55.2.3 php4/ext/odbc/config.m4:1.55.2.4 --- php4/ext/odbc/config.m4:1.55.2.3 Mon Mar 10 22:11:52 2003 +++ php4/ext/odbc/config.m4 Thu May 1 20:40:35 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.3 2003/03/11 03:11:52 sniper Exp $ +dnl $Id: config.m4,v 1.55.2.4 2003/05/02 00:40:35 sniper Exp $ dnl dnl @@ -538,6 +538,7 @@ if test "$ODBC_TYPE" != "dbmaker"; then ext_shared=$shared PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD) + AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ]) fi AC_DEFINE(HAVE_UODBC,1,[ ]) Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.143.2.8 php4/ext/odbc/php_odbc.c:1.143.2.9 --- php4/ext/odbc/php_odbc.c:1.143.2.8 Wed Apr 30 07:12:03 2003 +++ php4/ext/odbc/php_odbc.c Thu May 1 20:40:35 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.143.2.8 2003/04/30 11:12:03 wez Exp $ */ +/* $Id: php_odbc.c,v 1.143.2.9 2003/05/02 00:40:35 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -79,7 +79,9 @@ PHP_FE(odbc_commit, NULL) PHP_FE(odbc_connect, NULL) PHP_FE(odbc_cursor, NULL) +#ifdef HAVE_SQLDATASOURCES PHP_FE(odbc_data_source, NULL) +#endif PHP_FE(odbc_execute, NULL) PHP_FE(odbc_error, NULL) PHP_FE(odbc_errormsg, NULL) @@ -1183,6 +1185,7 @@ } /* }}} */ +#ifdef HAVE_SQLDATASOURCES /* {{{ proto array odbc_data_source(int connection_id, int fetch_type) Return information about the currently connected data source */ PHP_FUNCTION(odbc_data_source) @@ -1243,6 +1246,7 @@ } /* }}} */ +#endif /* HAVE_SQLDATASOURCES * /* {{{ proto int odbc_exec(int connection_id, string query [, int flags]) Prepare and execute an SQL statement */ Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.48.4.3 php4/ext/odbc/php_odbc.h:1.48.4.4 --- php4/ext/odbc/php_odbc.h:1.48.4.3 Wed Apr 30 19:33:18 2003 +++ php4/ext/odbc/php_odbc.h Thu May 1 20:40:35 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.48.4.3 2003/04/30 23:33:18 wez Exp $ */ +/* $Id: php_odbc.h,v 1.48.4.4 2003/05/02 00:40:35 sniper Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -54,7 +54,9 @@ PHP_FUNCTION(odbc_connect); PHP_FUNCTION(odbc_pconnect); PHP_FUNCTION(odbc_cursor); +#ifdef HAVE_SQLDATASOURCES PHP_FUNCTION(odbc_data_source); +#endif PHP_FUNCTION(odbc_do); PHP_FUNCTION(odbc_exec); PHP_FUNCTION(odbc_execute);