Skip to content

Commit 6e1eccc

Browse files
committed
check that needed functions exists
1 parent c8b946f commit 6e1eccc

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

config9.m4

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ if test "$PHP_PQ" != "no"; then
9999
PHP_SUBST(PQ_SHARED_LIBADD)
100100

101101
PQ_CHECK_FUNC(PQlibVersion)
102+
PQ_CHECK_FUNC(PQprotocolVersion)
103+
PQ_CHECK_FUNC(PQserverVersion)
102104
PQ_CHECK_FUNC(PQconninfo)
103105
PQ_CHECK_FUNC(PQsetSingleRowMode)
104106

src/php_pqconn.c

+8
Original file line numberDiff line numberDiff line change
@@ -505,12 +505,15 @@ static void php_pqconn_object_read_lib_version(void *o, zval *return_value)
505505
RETVAL_STRING(ver);
506506
}
507507
#endif
508+
#ifdef HAVE_PQPROTOCOLVERSION
508509
static void php_pqconn_object_read_protocol_version(void *o, zval *return_value)
509510
{
510511
php_pqconn_object_t *obj = o;
511512

512513
RETVAL_LONG(PQprotocolVersion(obj->intern->conn));
513514
}
515+
#endif
516+
#ifdef HAVE_PQSERVERVERSION
514517
static void php_pqconn_object_read_server_version(void *o, zval *return_value)
515518
{
516519
php_pqconn_object_t *obj = o;
@@ -524,6 +527,7 @@ static void php_pqconn_object_read_server_version(void *o, zval *return_value)
524527
}
525528
RETVAL_STRING(ver);
526529
}
530+
#endif
527531

528532
static ZEND_RESULT_CODE php_pqconn_update_socket(zval *zobj, php_pqconn_object_t *obj)
529533
{
@@ -2171,13 +2175,17 @@ PHP_MINIT_FUNCTION(pqconn)
21712175
zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("libraryVersion"), (void *) &ph, sizeof(ph));
21722176
#endif
21732177

2178+
#ifdef HAVE_PQPROTOCOLVERSION
21742179
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("protocolVersion"), ZEND_ACC_PUBLIC);
21752180
ph.read = php_pqconn_object_read_protocol_version;
21762181
zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("protocolVersion"), (void *) &ph, sizeof(ph));
2182+
#endif
21772183

2184+
#ifdef HAVE_PQSERVERVERSION
21782185
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("serverVersion"), ZEND_ACC_PUBLIC);
21792186
ph.read = php_pqconn_object_read_server_version;
21802187
zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("serverVersion"), (void *) &ph, sizeof(ph));
2188+
#endif
21812189

21822190
zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("OK"), CONNECTION_OK);
21832191
zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("BAD"), CONNECTION_BAD);

0 commit comments

Comments
 (0)