[sane-devel] Fwd: [sane-commit] [SCM] SANE backends - scanner drivers branch, master, updated. RELEASE_1_0_22-173-gc64249f

[Chris Bagwell]

Your right. I'll fix it.

When I noticed I had killed Linux compiles in git, I rushed to fast to
get the fix in and restored to much logic from the original code it
was based on in espon2.c backend.

Thank you much for reviewing the diff!

Chris

On Wed, Nov 9, 2011 at 8:31 AM, Stef <stef.dev at free.fr> wrote:
>        Hello,
>
>        I don't get what save_flags var is for:
>
>        save_flags = flags = fcntl(fd, F_GETFL, 0L);
>
>        it is not used anywhere in sanei_udp_set_nonblock().
>
> Regards,
>        Stef
>
> ---------- Forwarded message ----------
> From: Chris Bagwell <chris at cnpbagwell.com>
> To: sane-commit at lists.alioth.debian.org
> Date: Wed, 09 Nov 2011 03:23:34 +0000
> Subject: [sane-commit] [SCM] SANE backends - scanner drivers branch, master, updated. RELEASE_1_0_22-173-gc64249f
> The following commit has been merged in the master branch:
> commit c64249fc318aaef44f8be89f3f4480553904c7eb
> Author: Chris Bagwell <chris at cnpbagwell.com>
> Date:   Tue Nov 8 21:22:42 2011 -0600
>
>    fix compile failure on non-windows platform.
>
> diff --git a/sanei/sanei_udp.c b/sanei/sanei_udp.c
> index 3e84761..795b2de 100644
> --- a/sanei/sanei_udp.c
> +++ b/sanei/sanei_udp.c
> @@ -45,6 +45,7 @@
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <string.h>
> +#include <fcntl.h>
>
>  #ifdef HAVE_WINSOCK2_H
>  #include <winsock2.h>
> @@ -194,7 +195,7 @@ sanei_udp_set_nonblock(int fd, SANE_Bool nonblock)
>
>        ioctlsocket(fd, FIONBIO, &mode);
>  #else
> -       long flags;
> +       long save_flags, flags;
>
>        save_flags = flags = fcntl(fd, F_GETFL, 0L);
>        if (nonblock)
>
> --
> SANE backends - scanner drivers
>
> _______________________________________________
> sane-commit mailing list
> sane-commit at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-commit
>
> --
> sane-devel mailing list: sane-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/sane-devel
> Unsubscribe: Send mail with subject "unsubscribe your_password"
>             to sane-devel-request at lists.alioth.debian.org
>