1 files changed, 11 insertions, 11 deletions

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index d1cdb2b6f3..2c1890cc26 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -566,7 +566,7 @@ PHP_FUNCTION(ora_open)
 	oraConnection *conn = NULL;
 	oraCursor *cursor = NULL;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn);
@@ -701,7 +701,7 @@ PHP_FUNCTION(ora_parse)
 	sword defer = 0;
 	text *query;
 
-	switch (ARG_COUNT(ht)) {
+	switch (ZEND_NUM_ARGS()) {
 	case 3:
 		zend_get_parameters_ex(3,&curs,&sql,&def);
 		convert_to_long_ex(def);
@@ -761,7 +761,7 @@ PHP_FUNCTION(ora_bind)
 	oraCursor *cursor;
 	char *paramname;
 
-	switch (ARG_COUNT(ht)) {
+	switch (ZEND_NUM_ARGS()) {
 	case 5:
 		zend_get_parameters_ex(5,&curs,&pvar,&svar,&plen,&ptyp);
 		convert_to_long_ex(ptyp);
@@ -942,7 +942,7 @@ PHP_FUNCTION(ora_do)
 	oraCursor *cursor = NULL;
 	text *query;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &con,&sql) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &con,&sql) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE2(conn, oraConnection *, con, -1, "Oracle-Connection", le_conn, le_pconn);
@@ -1053,7 +1053,7 @@ PHP_FUNCTION(ora_fetch_into)
 	int i;
 	int flags = 0;
 
-	switch(ARG_COUNT(ht)){
+	switch(ZEND_NUM_ARGS()){
 	case 2:
 		zend_get_parameters_ex(2, &curs, &arr);
 		break;
@@ -1193,7 +1193,7 @@ PHP_FUNCTION(ora_columnname)
 	pval **curs, **col;
 	oraCursor *cursor = NULL;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1231,7 +1231,7 @@ PHP_FUNCTION(ora_columntype)
 	int colno;
 	oraCursor *cursor = NULL;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1299,7 +1299,7 @@ PHP_FUNCTION(ora_columnsize)
 	pval **curs, **col;
 	oraCursor *cursor = NULL;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	/* Find the cursor */
@@ -1339,7 +1339,7 @@ PHP_FUNCTION(ora_getcolumn)
 	int len;
 	sb2 type;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &curs, &col) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1465,7 +1465,7 @@ PHP_FUNCTION(ora_error)
 	void *res;
 	int what;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor);
@@ -1491,7 +1491,7 @@ PHP_FUNCTION(ora_errorcode)
 	void *res;
 	int what;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor);