Fix ext/pgsql builds against libpq 7.3.

Fixes bug #67555 (Cannot build against libpq 7.3).

diff --git a/NEWS b/NEWS
index bf4bf60048bc3b8fb1e7f788e1729fcc40b1358f..1fefe0eea4a23ced514dfcb5d950f0597f5ef72d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed buf #67497 (eval with parse error causes segmentation fault in
     generator). (Nikita)
 
+- pgsql:
+  . Fix bug #67555 (Cannot build against libpq 7.3). (Adam)
+
 
 03 Jul 2014, PHP 5.6.0 Release Candidate 2
 

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index be351297d0b4a5a4f87a414c8ae47524c9a9e677..6a433af0f33d6e16875e55409e37e38e5a29bdea 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1127,7 +1127,9 @@ PHP_MINIT_FUNCTION(pgsql)
        REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_MADE", CONNECTION_MADE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_AWAITING_RESPONSE", CONNECTION_AWAITING_RESPONSE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_AUTH_OK", CONNECTION_AUTH_OK, CONST_CS | CONST_PERSISTENT);
+#ifdef CONNECTION_SSL_STARTUP
        REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_SSL_STARTUP", CONNECTION_SSL_STARTUP, CONST_CS | CONST_PERSISTENT);
+#endif
        REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_SETENV", CONNECTION_SETENV, CONST_CS | CONST_PERSISTENT);
        /* For pg_connect_poll() */
        REGISTER_LONG_CONSTANT("PGSQL_POLLING_FAILED", PGRES_POLLING_FAILED, CONST_CS | CONST_PERSISTENT);