cvs: php-src(PHP_5_0) /ext/readline readline.c

iliaa Tue Apr 12 12:42:20 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/readline readline.c Log: MFH: Fixed compiler warning. http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.35.2.2&r2=1.35.2.3&ty=u Index: php-src/ext/readline/readline.c diff -u php-src/ext/readline/readline.c:1.35.2.2 php-src/ext/readline/readline.c:1.35.2.3 --- php-src/ext/readline/readline.c:1.35.2.2 Thu Feb 3 19:21:58 2005 +++ php-src/ext/readline/readline.c Tue Apr 12 12:42:20 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.35.2.2 2005/02/04 00:21:58 iliaa Exp $ */ +/* $Id: readline.c,v 1.35.2.3 2005/04/12 16:42:20 iliaa Exp $ */ /* {{{ includes & prototypes */ @@ -154,13 +154,13 @@ add_assoc_long(return_value,"done",rl_done); add_assoc_long(return_value,"pending_input",rl_pending_input); add_assoc_string(return_value,"prompt",SAFE_STRING(rl_prompt),1); - add_assoc_string(return_value,"terminal_name",SAFE_STRING(rl_terminal_name),1); + add_assoc_string(return_value,"terminal_name",(char *)SAFE_STRING(rl_terminal_name),1); #endif #if HAVE_ERASE_EMPTY_LINE add_assoc_long(return_value,"erase_empty_line",rl_erase_empty_line); #endif - add_assoc_string(return_value,"library_version",SAFE_STRING(rl_library_version),1); - add_assoc_string(return_value,"readline_name",SAFE_STRING(rl_readline_name),1); + add_assoc_string(return_value,"library_version",(char *)SAFE_STRING(rl_library_version),1); + add_assoc_string(return_value,"readline_name",(char *)SAFE_STRING(rl_readline_name),1); } else { convert_to_string_ex(what); @@ -196,7 +196,7 @@ } else if (! strcasecmp(Z_STRVAL_PP(what),"prompt")) { RETVAL_STRING(SAFE_STRING(rl_prompt),1); } else if (! strcasecmp(Z_STRVAL_PP(what),"terminal_name")) { - RETVAL_STRING(SAFE_STRING(rl_terminal_name),1); + RETVAL_STRING((char *)SAFE_STRING(rl_terminal_name),1); #endif #if HAVE_ERASE_EMPTY_LINE } else if (! strcasecmp(Z_STRVAL_PP(what),"erase_empty_line")) { @@ -208,9 +208,9 @@ RETVAL_LONG(oldval); #endif } else if (! strcasecmp(Z_STRVAL_PP(what),"library_version")) { - RETVAL_STRING(SAFE_STRING(rl_library_version),1); + RETVAL_STRING((char *)SAFE_STRING(rl_library_version),1); } else if (! strcasecmp(Z_STRVAL_PP(what),"readline_name")) { - oldstr = rl_readline_name; + oldstr = (char *)rl_readline_name; if (ac == 2) { /* XXX if (rl_readline_name) free(rl_readline_name); */ convert_to_string_ex(value);