[sane-devel] [PATCH] dll: Use STRINGIFY1 instead of STRINGIFY

Niels Ole Salscheider niels_ole at salscheider-online.de
Sat Jun 6 08:46:27 UTC 2015


Please ignore this patch, it does not work either. I will try to find a 
working solution.

On Friday 05 June 2015, 21:14:02, Niels Ole Salscheider wrote:
> Otherwise, LIBDIR is expanded which breaks the path. E. g. "linux"
> is replaced by "1" in x86_64-pc-linux-gnu.
> ---
>  backend/dll.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/backend/dll.c b/backend/dll.c
> index 619ee55..13d14f6 100644
> --- a/backend/dll.c
> +++ b/backend/dll.c
> @@ -430,7 +430,7 @@ load (struct backend *be)
> 
>    if (path)
>      {
> -      src_len = strlen (path) + strlen (STRINGIFY (LIBDIR)) + 1 + 1;
> +      src_len = strlen (path) + strlen (STRINGIFY1 (LIBDIR)) + 1 + 1;
>        src = malloc (src_len);
>        if (!src)
>  	{
> @@ -438,11 +438,11 @@ load (struct backend *be)
>  	  return SANE_STATUS_NO_MEM;
>  	}
>        orig_src = src;
> -      snprintf (src, src_len, "%s:%s", path, STRINGIFY (LIBDIR));
> +      snprintf (src, src_len, "%s:%s", path, STRINGIFY1 (LIBDIR));
>      }
>    else
>      {
> -      src = STRINGIFY (LIBDIR);
> +      src = STRINGIFY1 (LIBDIR);
>        src = strdup (src);
>        if (!src)
>  	{
> --
> 2.4.2




More information about the sane-devel mailing list