Fix ext/pgsql builds with libpq < 7.3.

Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).

diff --git a/NEWS b/NEWS
index 89edf0c32c227e7245d15287707655c3e6fcfb25..ccc90277ba1361e327c406326412791f930c8e91 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ PHP                                                                        NEWS
 - FPM:
   . Fix bug #67531 (syslog cannot be set in pool configuration). (Remi)
 
+- pgsql:
+  . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
+    which affected builds against libpq < 7.3. (Adam)
+
 - Streams:
   . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
 

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index c91677c9612e1f8c3e53c7cfb963f088c398904a..16ce7bfb7f9c21a6f354f2d47102aaeacfae3a4d 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -753,7 +753,7 @@ static int le_link, le_plink, le_result, le_lofp, le_string;
 #endif
 
 #if !HAVE_PQESCAPE_CONN
-#define PQescapeStringConn(conn, to, form, len, error) PQescapeString(to, from, len)
+#define PQescapeStringConn(conn, to, from, len, error) PQescapeString(to, from, len)
 #endif
 
 #if HAVE_PQESCAPELITERAL