cvs: php4 /ext/cyrus cyrus.c /ext/ldap ldap.c

derick Tue Apr 23 15:01:31 2002 EDT Modified files: /php4/ext/ldap ldap.c /php4/ext/cyrus cyrus.c Log: Fix TSRMLS_CC thingies. Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.116 php4/ext/ldap/ldap.c:1.117 --- php4/ext/ldap/ldap.c:1.116 Thu Feb 28 03:26:18 2002 +++ php4/ext/ldap/ldap.c Tue Apr 23 15:01:30 2002 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.116 2002/02/28 08:26:18 sebastian Exp $ */ +/* $Id: ldap.c,v 1.117 2002/04/23 19:01:30 derick Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -263,7 +263,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.116 2002/02/28 08:26:18 sebastian Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.117 2002/04/23 19:01:30 derick Exp $" ); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -2040,7 +2040,7 @@ ZVAL_STRING(cb_url, estrdup(url), 0); cb_args[0] = &cb_link; cb_args[1] = &cb_url; - if (call_user_function_ex(EG(function_table), NULL, ld->rebindproc, &cb_retval, 2, cb_args, 0, NULL) == SUCCESS && cb_retval) { + if (call_user_function_ex(EG(function_table), NULL, ld->rebindproc, &cb_retval, 2, cb_args, 0, NULL TSRMLS_CC) == SUCCESS && cb_retval) { convert_to_long_ex(&cb_retval); retval = Z_LVAL_P(cb_retval); zval_ptr_dtor(&cb_retval); Index: php4/ext/cyrus/cyrus.c diff -u php4/ext/cyrus/cyrus.c:1.9 php4/ext/cyrus/cyrus.c:1.10 --- php4/ext/cyrus/cyrus.c:1.9 Thu Feb 28 03:25:54 2002 +++ php4/ext/cyrus/cyrus.c Tue Apr 23 15:01:31 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyrus.c,v 1.9 2002/02/28 08:25:54 sebastian Exp $ */ +/* $Id: cyrus.c,v 1.10 2002/04/23 19:01:31 derick Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -357,7 +357,7 @@ argv[3] = &msgno; if (call_user_function_ex(EG(function_table), NULL, callback->function, - &retval, 4, argv, 0, NULL) == FAILURE) { + &retval, 4, argv, 0, NULL TSRMLS_CC) == FAILURE) { php_error(E_WARNING, "Couldn't call the %s handler", callback->trigger); }