[git] ADNS-g10 - branch, master, updated. adns-1.4-g10-6-19-g0b927ad

by Werner Koch cvs at cvs.gnupg.org
Sat Jun 25 17:30:28 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ADNS migrated to autotools/libtool".

The branch, master has been updated
       via  0b927ad536d0338ddc205bc58940a147de1dff92 (commit)
      from  0d2f64783f35bbae58a5eeabcaf234d04dccfdbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0b927ad536d0338ddc205bc58940a147de1dff92
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Jun 25 17:28:27 2016 +0200

    w32: Silence const warning for select.
    
    * src/w32support.c (adns__sock_select): Use a copy of the timeout arg.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/w32support.c b/src/w32support.c
index 4d7bb64..1a2474f 100644
--- a/src/w32support.c
+++ b/src/w32support.c
@@ -211,9 +211,18 @@ adns__sock_close (int fd)
 
 int
 adns__sock_select (int nfds, fd_set *rset, fd_set *wset, fd_set *xset,
-                   const struct timeval *timeout)
+                   const struct timeval *timeout_arg)
 {
   int rc;
+  struct timeval timeout_buf, *timeout;
+
+  if (timeout_arg)
+    {
+      timeout_buf = *timeout_arg;
+      timeout = &timeout_buf;
+    }
+  else
+    timeout = NULL;
 
   rc = select (nfds, rset, wset, xset, timeout);
   if (rc == -1)

-----------------------------------------------------------------------

Summary of changes:
 src/w32support.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
ADNS migrated to autotools/libtool
http://git.gnupg.org




More information about the Gnupg-commits mailing list