johannes Tue Feb 21 21:04:19 2006 UTC
Modified files:
/php-src/sapi/cli php_cli_readline.c
Log:
- Fix build with readline-support
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli_readline.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.8
php-src/sapi/cli/php_cli_readline.c:1.9
--- php-src/sapi/cli/php_cli_readline.c:1.8 Sun Jan 1 13:09:58 2006
+++ php-src/sapi/cli/php_cli_readline.c Tue Feb 21 21:04:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli_readline.c,v 1.8 2006/01/01 13:09:58 sniper Exp $ */
+/* $Id: php_cli_readline.c,v 1.9 2006/02/21 21:04:19 johannes Exp $ */
#include "php.h"
@@ -344,14 +344,14 @@
int32_t tmp_len, len;
UErrorCode status = U_ZERO_ERROR;
- len = u_strlen((UChar *)func->common.function_name);
+ len = u_strlen((UChar *)func->common.function_name.u);
zend_convert_from_unicode(ZEND_U_CONVERTER(UG(output_encoding_conv)), &tmp,
&tmp_len,
-
(UChar *)func->common.function_name, len, &status);
+
(UChar *)func->common.function_name.u, len, &status);
retval = strdup(tmp);
efree(tmp);
} else {
- retval = strdup(func->common.function_name);
+ retval = strdup(func->common.function_name.s);
}
}
@@ -370,14 +370,14 @@
int32_t tmp_len, len;
UErrorCode status = U_ZERO_ERROR;
- len = u_strlen((UChar *)(*pce)->name);
+ len = u_strlen((UChar *)(*pce)->name.u);
zend_convert_from_unicode(ZEND_U_CONVERTER(UG(output_encoding_conv)), &tmp,
&tmp_len,
-
(UChar *)(*pce)->name, len, &status);
+
(UChar *)(*pce)->name.u, len, &status);
retval = strdup(tmp);
efree(tmp);
} else {
- retval = strdup((*pce)->name);
+ retval = strdup((*pce)->name.s);
}
}
@@ -479,7 +479,7 @@
if (pce && retval) {
char *tmp = malloc(class_name_len + 2 + strlen(retval)
+ 1);
- sprintf(tmp, "%s::%s", (*pce)->name, retval);
+ sprintf(tmp, "%s::%s", (*pce)->name.s, retval);
free(retval);
retval = tmp;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
