[PATCHv2] smbreadline: switch to new-style readline typedef

Jeremy Allison jra at samba.org
Wed Mar 12 15:12:00 MDT 2014


On Thu, Mar 06, 2014 at 06:57:40PM -0300, Gustavo Zacarias wrote:
> Function, CPFunction, CPPFunction and VFunction typedefs are considered
> old-style (deprecated) starting from readline 4.2 (circa 2001).
> Compatibility typedefs have been in place up to readline 6.2 but were
> removed with the 6.3 release thus causing builds to break.
> Switch to the new-style specific prototyped typedef.
> 
> Return value is unused so the callback should still be void (see
> readline/input.c around line 456 in version 6.3).
> 
> Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
> ---
>  libcli/smbreadline/smbreadline.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
> index cff25a7..80e10b0 100644
> --- a/libcli/smbreadline/smbreadline.c
> +++ b/libcli/smbreadline/smbreadline.c
> @@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
>  
>  #if HAVE_DECL_RL_EVENT_HOOK
>  	if (callback)
> -		rl_event_hook = (Function *)callback;
> +		rl_event_hook = (rl_hook_func_t *)callback;
>  #endif
>  	ret = readline(prompt);
>  	if (ret && *ret)
> -- 
> 1.8.3.2

Thanks - pushed to autobuild !


More information about the samba-technical mailing list