[Pkg-gnupg-commit] [gnupg2] 71/132: dirmngr: More fix for Windows.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 4771bad610eb59e701fe8e53468e2af22d45eeb0
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Apr 14 08:32:49 2017 +0900

    dirmngr: More fix for Windows.
    
    * dirmngr/http.c (simple_cookie_read, simple_cookie_write): Only
    valid with HTTP_USE_NTBTLS.
    (_my_socket_new): Simply cast to int since it's for debug.
    (_my_socket_ref, _my_socket_unref): Likewise.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 dirmngr/http.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dirmngr/http.c b/dirmngr/http.c
index e645a54..9b70599 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -166,7 +166,7 @@ static gpgrt_ssize_t cookie_read (void *cookie, void *buffer, size_t size);
 static gpgrt_ssize_t cookie_write (void *cookie,
                                    const void *buffer, size_t size);
 static int cookie_close (void *cookie);
-#ifdef HAVE_W32_SYSTEM
+#if defined(HAVE_W32_SYSTEM) && defined(HTTP_USE_NTBTLS)
 static gpgrt_ssize_t simple_cookie_read (void *cookie,
                                          void *buffer, size_t size);
 static gpgrt_ssize_t simple_cookie_write (void *cookie,
@@ -213,7 +213,7 @@ typedef struct cookie_s *cookie_t;
 
 /* Simple cookie functions.  Here the cookie is an int with the
  * socket. */
-#ifdef HAVE_W32_SYSTEM
+#if defined(HAVE_W32_SYSTEM) && defined(HTTP_USE_NTBTLS)
 static es_cookie_io_functions_t simple_cookie_functions =
   {
     simple_cookie_read,
@@ -383,7 +383,7 @@ _my_socket_new (int lnr, assuan_fd_t fd)
   so->refcount = 1;
   if (opt_debug)
     log_debug ("http.c:%d:socket_new: object %p for fd %d created\n",
-               lnr, so, so->fd);
+               lnr, so, (int)so->fd);
   return so;
 }
 #define my_socket_new(a) _my_socket_new (__LINE__, (a))
@@ -395,7 +395,7 @@ _my_socket_ref (int lnr, my_socket_t so)
   so->refcount++;
   if (opt_debug > 1)
     log_debug ("http.c:%d:socket_ref: object %p for fd %d refcount now %d\n",
-               lnr, so, so->fd, so->refcount);
+               lnr, so, (int)so->fd, so->refcount);
   return so;
 }
 #define my_socket_ref(a) _my_socket_ref (__LINE__,(a))
@@ -413,7 +413,7 @@ _my_socket_unref (int lnr, my_socket_t so,
       so->refcount--;
       if (opt_debug > 1)
         log_debug ("http.c:%d:socket_unref: object %p for fd %d ref now %d\n",
-                   lnr, so, so->fd, so->refcount);
+                   lnr, so, (int)so->fd, so->refcount);
 
       if (!so->refcount)
         {
@@ -2923,7 +2923,7 @@ cookie_write (void *cookie, const void *buffer_arg, size_t size)
 }
 
 
-#ifdef HAVE_W32_SYSTEM
+#if defined(HAVE_W32_SYSTEM) && defined(HTTP_USE_NTBTLS)
 static gpgrt_ssize_t
 simple_cookie_read (void *cookie, void *buffer, size_t size)
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git