diff options
Diffstat (limited to 'ext/pgsql')
| -rw-r--r-- | ext/pgsql/config.m4 | 1 | ||||
| -rw-r--r-- | ext/pgsql/pgsql.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index c40840cc3c..bd83c2794e 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -12,7 +12,6 @@ AC_ARG_WITH(pgsql, else PGSQL_INCDIR=$withval/include test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql - test -d $withval/include/postgresql && PGSQL_INCDIR=$withval/include/postgresql PGSQL_LIBDIR=$withval/lib test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql fi diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 4738a21a93..2e4412c3fd 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -351,13 +351,15 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) int php3_pgsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (php3_pgsql_module.default_link==-1) { /* no link opened yet, implicitly open one */ - ht = 0; + HashTable tmp; + + _php3_hash_init(&tmp,0,NULL,NULL,0); php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); + _php3_hash_destroy(&tmp); } return php3_pgsql_module.default_link; } - /* {{{ proto int pg_connect([string connection_string] | [string host, string port, [string options, [string tty,]] string database) Open a PostgreSQL connection */ PHP_FUNCTION(pgsql_connect) @@ -953,7 +955,7 @@ PHP_FUNCTION(pgsql_fetch_row) /* }}} */ /* ?? This is a rather odd function - why not just point pg_fetcharray() directly at fetch_hash ? -RL */ -/* {{{ proto array pg_fetch_array(int result, int row [, int result_type]) +/* {{{ proto array pg_fetch_array(int result, int row) Fetch a row as an array */ PHP_FUNCTION(pgsql_fetch_array) { @@ -961,7 +963,7 @@ PHP_FUNCTION(pgsql_fetch_array) } /* }}} */ -/* {{{ proto object pg_fetch_object(int result, int row [, int result_type]) +/* {{{ proto object pg_fetch_object(int result, int row) Fetch a row as an object */ PHP_FUNCTION(pgsql_fetch_object) { |