diff mbox series

[48/51] io/channel-watch: Drop a superfluous '#ifdef WIN32'

Message ID 20220824094029.1634519-49-bmeng.cn@gmail.com (mailing list archive)
State New, archived
Headers show
Series tests/qtest: Enable running qtest on Windows | expand

Commit Message

Bin Meng Aug. 24, 2022, 9:40 a.m. UTC 
From: Bin Meng <bin.meng@windriver.com>

In the win32 version qio_channel_create_socket_watch() body there is
no need to do a '#ifdef WIN32'.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 io/channel-watch.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Marc-André Lureau Sept. 1, 2022, 12:24 p.m. UTC | #1 
On Wed, Aug 24, 2022 at 2:37 PM Bin Meng <bmeng.cn@gmail.com> wrote:

> From: Bin Meng <bin.meng@windriver.com>
>
> In the win32 version qio_channel_create_socket_watch() body there is
> no need to do a '#ifdef WIN32'.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>
>  io/channel-watch.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/io/channel-watch.c b/io/channel-watch.c
> index 0289b3647c..89f3c8a88a 100644
> --- a/io/channel-watch.c
> +++ b/io/channel-watch.c
> @@ -285,11 +285,9 @@ GSource *qio_channel_create_socket_watch(QIOChannel
> *ioc,
>      GSource *source;
>      QIOChannelSocketSource *ssource;
>
> -#ifdef WIN32
>      WSAEventSelect(socket, ioc->event,
>                     FD_READ | FD_ACCEPT | FD_CLOSE |
>                     FD_CONNECT | FD_WRITE | FD_OOB);
> -#endif
>
>      source = g_source_new(&qio_channel_socket_source_funcs,
>                            sizeof(QIOChannelSocketSource));
> --
> 2.34.1
>
>
>
Daniel P. Berrangé Oct. 17, 2022, 12:34 p.m. UTC | #2 
On Wed, Aug 24, 2022 at 05:40:26PM +0800, Bin Meng wrote:
> From: Bin Meng <bin.meng@windriver.com>
> 
> In the win32 version qio_channel_create_socket_watch() body there is
> no need to do a '#ifdef WIN32'.
> 
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
> 
>  io/channel-watch.c | 2 --
>  1 file changed, 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

and queued

With regards,
Daniel
diff mbox series

Patch

diff --git a/io/channel-watch.c b/io/channel-watch.c
index 0289b3647c..89f3c8a88a 100644
--- a/io/channel-watch.c
+++ b/io/channel-watch.c
@@ -285,11 +285,9 @@  GSource *qio_channel_create_socket_watch(QIOChannel *ioc,
     GSource *source;
     QIOChannelSocketSource *ssource;
 
-#ifdef WIN32
     WSAEventSelect(socket, ioc->event,
                    FD_READ | FD_ACCEPT | FD_CLOSE |
                    FD_CONNECT | FD_WRITE | FD_OOB);
-#endif
 
     source = g_source_new(&qio_channel_socket_source_funcs,
                           sizeof(QIOChannelSocketSource));