more internal conversions

[m6w6/ext-pq] / src / php_pqconn.c

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 3b920e77aeba9ec17e8cd50b67cc62e418cb71f5..e869d92acd9000ac7f8a2c10561cc96ceb2bca7d 100644 (file)
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -219,7 +219,7 @@ static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value
        }
 
        if (0 > PQsetClientEncoding(obj->intern->conn, Z_STRVAL_P(zenc))) {
-               zend_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
+               php_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
        }
 
        if (zenc != value) {
@@ -458,7 +458,7 @@ static void php_pqconn_object_write_def_auto_conv(zval*object, void *o, zval *va
                }
        }
 
-       obj->intern->default_auto_convert = Z_LVAL_P(zac) & 0xff;
+       obj->intern->default_auto_convert = Z_LVAL_P(zac) & PHP_PQRES_CONV_ALL;
 
        if (zac != value) {
                zval_ptr_dtor(&zac);