]> granicus.if.org Git - php/commitdiff
MFH: Fixed compiler warning.
authorIlia Alshanetsky <iliaa@php.net>
Tue, 12 Apr 2005 16:42:20 +0000 (16:42 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Tue, 12 Apr 2005 16:42:20 +0000 (16:42 +0000)
ext/readline/readline.c

index 67e48bb6fa35cfba17884cc3033f2e933d44abd4..9fbfb1a643deff44a91dc5a68b4d39abc1dd83b3 100644 (file)
@@ -154,13 +154,13 @@ PHP_FUNCTION(readline_info)
                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 @@ PHP_FUNCTION(readline_info)
                } 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 @@ PHP_FUNCTION(readline_info)
                        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);