Fix prototype.

Use user-supplied path before the default when looking for headers

diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32
index c1d955487cc52c3b962beb53d6e833d9f27ffb28..eaa232dfc9b1a4bf4c7736f4c0fc71eba3a168ab 100644 (file)
--- 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 28a726d1726910a5d915c2430e54f7d57e1eb119..b80935c19948c13bc75561876b19ba548e31f7a4 100644 (file)
--- 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;