cvs: php4 /ext/standard basic_functions.c

fmk Thu Dec 14 19:04:10 2000 EDT Modified files: /php4/ext/standard basic_functions.c Log: Fixing compilation on Win32. (and others) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.287 php4/ext/standard/basic_functions.c:1.288 --- php4/ext/standard/basic_functions.c:1.287 Thu Dec 14 17:01:13 2000 +++ php4/ext/standard/basic_functions.c Thu Dec 14 19:04:09 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.287 2000/12/15 01:01:13 ssb Exp $ */ +/* $Id: basic_functions.c,v 1.288 2000/12/15 03:04:09 fmk Exp $ */ #include "php.h" #include "php_main.h" @@ -194,8 +194,9 @@ PHP_NAMED_FE(printf, PHP_FN(user_printf), NULL) PHP_FE(sscanf, third_and_rest_force_ref) PHP_FE(fscanf, third_and_rest_force_ref) +#ifdef HAVE_ICONV PHP_FE(iconv, NULL) - +#endif PHP_FE(parse_url, NULL) PHP_FE(urlencode, NULL) PHP_FE(urldecode, NULL) @@ -1619,7 +1620,7 @@ SEPARATE_ZVAL(params[0]); SEPARATE_ZVAL(params[1]); convert_to_string(*params[0]); - if (call_user_function_ex(CG(function_table), *params[1], params[0], &retval_ptr, arg_count-2, params+2, 1, NULL)==SUCCESS + if (call_user_function_ex(CG(function_table), params[1], *params[0], &retval_ptr, arg_count-2, params+2, 1, NULL)==SUCCESS && retval_ptr) { COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr); } else {