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

sniper Thu May 1 20:40:20 2003 EDT Modified files: /php4/ext/odbc config.m4 php_odbc.c php_odbc.h Log: - Fixed bug #22580 (ext/odbc compile failure with dbmaker) Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.59 php4/ext/odbc/config.m4:1.60 --- php4/ext/odbc/config.m4:1.59 Mon Mar 10 22:11:36 2003 +++ php4/ext/odbc/config.m4 Thu May 1 20:40:20 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.59 2003/03/11 03:11:36 sniper Exp $ +dnl $Id: config.m4,v 1.60 2003/05/02 00:40:20 sniper Exp $ dnl dnl @@ -539,6 +539,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.160 php4/ext/odbc/php_odbc.c:1.161 --- php4/ext/odbc/php_odbc.c:1.160 Wed Apr 30 06:45:45 2003 +++ php4/ext/odbc/php_odbc.c Thu May 1 20:40:20 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.160 2003/04/30 10:45:45 wez Exp $ */ +/* $Id: php_odbc.c,v 1.161 2003/05/02 00:40:20 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) @@ -1169,6 +1171,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) @@ -1229,6 +1232,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.54 php4/ext/odbc/php_odbc.h:1.55 --- php4/ext/odbc/php_odbc.h:1.54 Wed Apr 30 19:32:36 2003 +++ php4/ext/odbc/php_odbc.h Thu May 1 20:40:20 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.54 2003/04/30 23:32:36 wez Exp $ */ +/* $Id: php_odbc.h,v 1.55 2003/05/02 00:40:20 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);