summaryrefslogtreecommitdiff
path: root/ext/pdo_pgsql
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2004-05-20 10:24:17 +0000
committerWez Furlong <wez@php.net>2004-05-20 10:24:17 +0000
commitd9decf0dfc7e21cd5623f2c1b053d44a11c3c3ff (patch)
tree1ca72e731e89fb40d7c4663a11fb75f3ba9efafe /ext/pdo_pgsql
parentfa1b0a51d36823eeed031350b2b2008bd81a662c (diff)
downloadphp-git-d9decf0dfc7e21cd5623f2c1b053d44a11c3c3ff.tar.gz
Fix prototype.
Use user-supplied path before the default when looking for headers
Diffstat (limited to 'ext/pdo_pgsql')
-rw-r--r--ext/pdo_pgsql/config.w322
-rw-r--r--ext/pdo_pgsql/pgsql_driver.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32
index c1d955487c..eaa232dfc9 100644
--- a/ext/pdo_pgsql/config.w32
+++ b/ext/pdo_pgsql/config.w32
@@ -5,7 +5,7 @@ ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no");
if (PHP_PDO_PGSQL != "no") {
if (CHECK_LIB("libpq.lib", "pdo_pgsql", PHP_PDO_PGSQL) &&
- CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PDO_PGSQL", PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PDO_PGSQL)) {
+ CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) {
EXTENSION("pdo_pgsql", "pdo_pgsql.c pgsql_driver.c pgsql_statement.c");
ADD_FLAG('CFLAGS_PDO_PGSQL', "/I ..\\pecl");
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index 28a726d172..b80935c199 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -67,7 +67,7 @@ static int pgsql_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len,
return 1;
}
-static int pgsql_handle_doer(pdo_dbh_t *dbh, const char *sql TSRMLS_DC)
+static int pgsql_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRMLS_DC)
{
pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;