Fix function prototypes to match ones in libassuan.

* src/assuan-support.c (my_read, my_write): Use ssize_t.
(my_socket, my_connect): Use int instead of assuan_fd_t for older
libassuan.
* tests/gpg/t-encrypt-large.c (read_cb, write_cb): Use gpgme_ssize_t.

--

Signed-off-by: NIIBE Yutaka <[email protected]>

2 files changed, 22 insertions, 4 deletions

diff --git a/src/assuan-support.c b/src/assuan-support.c
index f473abf2..384b67b9 100644
--- a/src/assuan-support.c
+++ b/src/assuan-support.c
@@ -126,7 +126,7 @@ my_close (assuan_context_t ctx, assuan_fd_t fd)
 }
 
 
-static gpgme_ssize_t
+static ssize_t
 my_read (assuan_context_t ctx, assuan_fd_t fd, void *buffer, size_t size)
 {
   (void)ctx;
@@ -134,7 +134,7 @@ my_read (assuan_context_t ctx, assuan_fd_t fd, void *buffer, size_t size)
 }
 
 
-static gpgme_ssize_t
+static ssize_t
 my_write (assuan_context_t ctx, assuan_fd_t fd, const void *buffer, size_t size)
 {
   (void)ctx;
@@ -351,6 +351,7 @@ my_socketpair (assuan_context_t ctx, int namespace, int style,
 }
 
 
+#if ASSUAN_VERSION_NUMBER >= 0x030000
 static assuan_fd_t
 my_socket (assuan_context_t ctx, int namespace, int style, int protocol)
 {
@@ -366,6 +367,23 @@ my_connect (assuan_context_t ctx, assuan_fd_t sock, struct sockaddr *addr,
   (void)ctx;
   return _gpgme_io_connect ((int)sock, addr, length);
 }
+#else
+static int
+my_socket (assuan_context_t ctx, int namespace, int style, int protocol)
+{
+  (void)ctx;
+  return _gpgme_io_socket (namespace, style, protocol);
+}
+
+
+static int
+my_connect (assuan_context_t ctx, int sock, struct sockaddr *addr,
+	    socklen_t length)
+{
+  (void)ctx;
+  return _gpgme_io_connect (sock, addr, length);
+}
+#endif
 
 
 /* Note for Windows: Ignore the incompatible pointer type warning for
diff --git a/tests/gpg/t-encrypt-large.c b/tests/gpg/t-encrypt-large.c
index fd389de7..d4dd32b7 100644
--- a/tests/gpg/t-encrypt-large.c
+++ b/tests/gpg/t-encrypt-large.c
@@ -42,7 +42,7 @@ struct cb_parms
 
 
 /* The read callback used by GPGME to read data. */
-static ssize_t
+static gpgme_ssize_t
 read_cb (void *handle, void *buffer, size_t size)
 {
   struct cb_parms *parms = handle;
@@ -55,7 +55,7 @@ read_cb (void *handle, void *buffer, size_t size)
 }
 
 /* The write callback used by GPGME to write data. */
-static ssize_t
+static gpgme_ssize_t
 write_cb (void *handle, const void *buffer, size_t size)
 {
   struct cb_parms *parms = handle;