Hardcode strlen due to problems on SCO OpenServer 5.0.4 which defines

strlen to __std_hdr_strlen.

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 057607f854a407cbd6aa03da8920a2359681a342..abb9d19a88f696551921216601e505caf289c5d3 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -29,7 +29,7 @@ static ZEND_FUNCTION(zend_version);
 static ZEND_FUNCTION(func_num_args);
 static ZEND_FUNCTION(func_get_arg);
 static ZEND_FUNCTION(func_get_args);
-static ZEND_FUNCTION(strlen);
+static ZEND_NAMED_FUNCTION(zend_if_strlen);
 static ZEND_FUNCTION(strcmp);
 static ZEND_FUNCTION(strncmp);
 static ZEND_FUNCTION(strcasecmp);
@@ -74,7 +74,7 @@ static zend_function_entry builtin_functions[] = {
        ZEND_FE(func_num_args,          NULL)
        ZEND_FE(func_get_arg,           NULL)
        ZEND_FE(func_get_args,          NULL)
-       ZEND_FE(strlen,                         NULL)
+       { "strlen", zend_if_strlen, NULL },
        ZEND_FE(strcmp,                         NULL)
        ZEND_FE(strncmp,                        NULL)
        ZEND_FE(strcasecmp,                     NULL)
@@ -221,7 +221,7 @@ ZEND_FUNCTION(func_get_args)
 
 /* {{{ proto int strlen(string str)
    Get string length */
-ZEND_FUNCTION(strlen)
+ZEND_NAMED_FUNCTION(zend_if_strlen)
 {
        zval **str;