diff options
| author | SVN Migration <svn@php.net> | 1999-07-23 14:14:44 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 1999-07-23 14:14:44 +0000 |
| commit | 5cb21cbfef2dcdf31ac914920427d3d190c6ed26 (patch) | |
| tree | a6ea5826ba1eda810e9580a335798c020dfaeb9a /ext/msql | |
| parent | b1617d8ac3bad1ace92085194e24cff8cbdbaf31 (diff) | |
| download | php-git-php-4.0b1.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_4_0b1'.php-4.0b1
Diffstat (limited to 'ext/msql')
| -rw-r--r-- | ext/msql/config.m4 | 2 | ||||
| -rw-r--r-- | ext/msql/msql.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4 index 3ed38f3e46..25694d1b09 100644 --- a/ext/msql/config.m4 +++ b/ext/msql/config.m4 @@ -6,7 +6,7 @@ dnl AC_DEFUN(AC_MSQL_VERSION,[ AC_MSG_CHECKING([mSQL version]) ac_php_oldcflags=$CFLAGS - CFLAGS="$INCLUDES $CFLAGS" + CFLAGS="$INCLUDES $CFLAGS"; AC_TRY_COMPILE([#include <sys/types.h> #include "msql.h"],[int i = IDX_TYPE],[ AC_DEFINE(MSQL1,0) diff --git a/ext/msql/msql.c b/ext/msql/msql.c index 466df9ee15..aab491ef36 100644 --- a/ext/msql/msql.c +++ b/ext/msql/msql.c @@ -450,8 +450,7 @@ static int php3_msql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { MSQL_TLS_VARS; if (MSQL_GLOBAL(php3_msql_module).default_link==-1) { /* no link opened yet, implicitly open one */ - ht = 0; - php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php3_msql_do_connect(0, return_value, list, plist, this_ptr,0); } return MSQL_GLOBAL(php3_msql_module).default_link; } |