fix package.xml

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

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 76518f2b73b1e9c5aa6ae34f7552c339806114ad..e5c7118daff6ce5f40e52224009e1f7673f293f8 100644 (file)
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -485,23 +485,57 @@ static void php_pqres_object_read_diag(zval *object, void *o, zval *return_value
                char code;
                const char *const name;
        } diag[] = {
+#ifdef PG_DIAG_SEVERITY
                        {PG_DIAG_SEVERITY,                      "severity"},
+#endif
+#ifdef PG_DIAG_SQLSTATE
                        {PG_DIAG_SQLSTATE,                      "sqlstate"},
+#endif
+#ifdef PG_DIAG_MESSAGE_PRIMARY
                        {PG_DIAG_MESSAGE_PRIMARY,       "message_primary"},
+#endif
+#ifdef PG_DIAG_MESSAGE_DETAIL
                        {PG_DIAG_MESSAGE_DETAIL,        "message_detail"},
+#endif
+#ifdef PG_DIAG_MESSAGE_HINT
                        {PG_DIAG_MESSAGE_HINT,          "message_hint"},
+#endif
+#ifdef PG_DIAG_STATEMENT_POSITION
                        {PG_DIAG_STATEMENT_POSITION,"statement_position"},
+#endif
+#ifdef PG_DIAG_INTERNAL_POSITION
                        {PG_DIAG_INTERNAL_POSITION,     "internal_position"},
+#endif
+#ifdef PG_DIAG_INTERNAL_QUERY
                        {PG_DIAG_INTERNAL_QUERY,        "internal_query"},
+#endif
+#ifdef PG_DIAG_CONTEXT
                        {PG_DIAG_CONTEXT,                       "context"},
+#endif
+#ifdef PG_DIAG_SCHEMA_NAME
                        {PG_DIAG_SCHEMA_NAME,           "schema_name"},
+#endif
+#ifdef PG_DIAG_TABLE_NAME
                        {PG_DIAG_TABLE_NAME,            "table_name"},
+#endif
+#ifdef PG_DIAG_COLUMN_NAME
                        {PG_DIAG_COLUMN_NAME,           "column_name"},
+#endif
+#ifdef PG_DIAG_DATATYPE_NAME
                        {PG_DIAG_DATATYPE_NAME,         "datatype_name"},
+#endif
+#ifdef PG_DIAG_CONSTRAINT_NAME
                        {PG_DIAG_CONSTRAINT_NAME,       "constraint_name"},
+#endif
+#ifdef PG_DIAG_SOURCE_FILE
                        {PG_DIAG_SOURCE_FILE,           "source_file"},
+#endif
+#ifdef PG_DIAG_SOURCE_LINE
                        {PG_DIAG_SOURCE_LINE,           "source_line"},
-                       {PG_DIAG_SOURCE_FUNCTION,       "source_function"}
+#endif
+#ifdef PG_DIAG_SOURCE_FUNCTION
+                       {PG_DIAG_SOURCE_FUNCTION,       "source_function"},
+#endif
        };
 
        array_init_size(return_value, 32);
@@ -1150,7 +1184,7 @@ PHP_MINIT_FUNCTION(pqres)
        php_pqres_object_handlers.get_properties = php_pq_object_properties;
        php_pqres_object_handlers.count_elements = php_pqres_count_elements;
 
-       zend_hash_init(&php_pqres_object_prophandlers, 8, NULL, php_pq_object_prophandler_dtor, 1);
+       zend_hash_init(&php_pqres_object_prophandlers, 9, NULL, php_pq_object_prophandler_dtor, 1);
 
        zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("status"), ZEND_ACC_PUBLIC);
        ph.read = php_pqres_object_read_status;
@@ -1164,15 +1198,11 @@ PHP_MINIT_FUNCTION(pqres)
        ph.read = php_pqres_object_read_error_message;
        zend_hash_str_add_mem(&php_pqres_object_prophandlers, "errorMessage", sizeof("errorMessage")-1, (void *) &ph, sizeof(ph));
 
-<<<<<<< HEAD
-       zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("numRows"), 0, ZEND_ACC_PUBLIC);
-=======
-       zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("diag"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("diag"), ZEND_ACC_PUBLIC);
        ph.read = php_pqres_object_read_diag;
-       zend_hash_add(&php_pqres_object_prophandlers, "diag", sizeof("diag"), (void *) &ph, sizeof(ph), NULL);
+       zend_hash_str_add_mem(&php_pqres_object_prophandlers, "diag", sizeof("diag")-1, (void *) &ph, sizeof(ph));
 
-       zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("numRows"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
->>>>>>> v1.1.x
+       zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("numRows"), 0, ZEND_ACC_PUBLIC);
        ph.read = php_pqres_object_read_num_rows;
        zend_hash_str_add_mem(&php_pqres_object_prophandlers, "numRows", sizeof("numRows")-1, (void *) &ph, sizeof(ph));