From: Frank M. Kromann <fmk@php.net>
Date: Fri, 15 Dec 2000 03:04:09 +0000 (+0000)
Subject: Fixing compilation on Win32. (and others)
X-Git-Tag: php-4.0.5RC1~888
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e9acc15cfdf249c585609e0b47ebbe0699fa9ab;p=php

Fixing compilation on Win32. (and others)
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a02f419379..ca21545f2e 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -194,8 +194,9 @@ function_entry basic_functions[] = {
 	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 @@ PHP_FUNCTION(call_user_method)
 	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 {