From: Wez Furlong <wez@php.net>
Date: Mon, 27 Dec 2004 22:04:54 +0000 (+0000)
Subject: more get_method signature changes
X-Git-Tag: RELEASE_0_2~451
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73186934d8b5d96675d8ae330b988e2be167682d;p=php

more get_method signature changes
---

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index ab8b00e932..7383125d3c 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -241,9 +241,13 @@ static int really_register_bound_param(struct pdo_bound_param_data *param, pdo_s
 			}
 		}
 
+#if 0
+		/* if you prepare and then execute passing an array of params keyed by names,
+		 * then this will trigger, and we don't want that */
 		if (param->paramno == -1) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Did not found column name '%s' in the defined columns; it will not be bound", param->name);
 		}
+#endif
 	}
 
 	if (param->name) {
@@ -1012,10 +1016,19 @@ static HashTable *dbstmt_get_properties(zval *object TSRMLS_DC)
 	return NULL;
 }
 
-static union _zend_function *dbstmt_method_get(zval *object, char *method_name, int method_len TSRMLS_DC)
+static union _zend_function *dbstmt_method_get(
+#if PHP_API_VERSION >= 20041225
+	zval **object_pp,
+#else
+	zval *object,
+#endif
+   	char *method_name, int method_len TSRMLS_DC)
 {
 	zend_function *fbc;
 	char *lc_method_name;
+#if PHP_API_VERSION >= 20041225
+	zval *object = *object_pp;
+#endif
 
 	lc_method_name = emalloc(method_len + 1);
 	zend_str_tolower_copy(lc_method_name, method_name, method_len);
@@ -1351,10 +1364,19 @@ static HashTable *row_get_properties(zval *object TSRMLS_DC)
 	return ht;
 }
 
-static union _zend_function *row_method_get(zval *object, char *method_name, int method_len TSRMLS_DC)
+static union _zend_function *row_method_get(
+#if PHP_API_VERSION >= 20041225
+	zval **object_pp,
+#else
+	zval *object,
+#endif
+	char *method_name, int method_len TSRMLS_DC)
 {
 	zend_function *fbc;
 	char *lc_method_name;
+#if PHP_API_VERSION >= 20041225
+	zval *object = *object_pp;
+#endif
 
 	lc_method_name = emalloc(method_len + 1);
 	zend_str_tolower_copy(lc_method_name, method_name, method_len);