(struct assuan_io): Renamed elements READ and

WRITE to READFNC and WRITEFNC to avoid problems with read defined
as macro.  Changed callers.  Noted by Ville Skytt��.

diff --git a/trunk/assuan/ChangeLog b/trunk/assuan/ChangeLog
index 1cf2b2ac73a4a2a4846ee0167f0fdc3059979b98..b73a5dae17e05a61753577ccacefcf02839f5d73 100644 (file)
--- a/trunk/assuan/ChangeLog
+++ b/trunk/assuan/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-22  Werner Koch  <wk@g10code.com>
+
+       * assuan-defs.h (struct assuan_io): Renamed elements READ and
+       WRITE to READFNC and WRITEFNC to avoid problems with read defined
+       as macro.  Changed callers.  Noted by Ville Skyttä.
+
 2004-12-16  Marcus Brinkmann  <marcus@g10code.de>
 
        * assuan-pipe-connect.c (do_finish): Do not wait for child to finish.

diff --git a/trunk/assuan/assuan-buffer.c b/trunk/assuan/assuan-buffer.c
index 01e770016298a02bc771e180db09b48a47bbbc67..d9163b79fd3bb2f5de163652353e367424c015b7 100644 (file)
--- a/trunk/assuan/assuan-buffer.c
+++ b/trunk/assuan/assuan-buffer.c
@@ -32,7 +32,7 @@ writen (ASSUAN_CONTEXT ctx, const char *buffer, size_t length)
 {
   while (length)
     {
-      ssize_t nwritten = ctx->io->write (ctx, buffer, length);
+      ssize_t nwritten = ctx->io->writefnc (ctx, buffer, length);
       
       if (nwritten < 0)
         {
@@ -58,7 +58,7 @@ readline (ASSUAN_CONTEXT ctx, char *buf, size_t buflen,
   *r_nread = 0;
   while (nleft > 0)
     {
-      ssize_t n = ctx->io->read (ctx, buf, nleft);
+      ssize_t n = ctx->io->readfnc (ctx, buf, nleft);
 
       if (n < 0)
         {

diff --git a/trunk/assuan/assuan-defs.h b/trunk/assuan/assuan-defs.h
index 1f7f1f03896a9ca70e458ab154b4d5edd49527de..248dbf4e0802fd24bb01317f0b3c86f4f96b86b7 100644 (file)
--- a/trunk/assuan/assuan-defs.h
+++ b/trunk/assuan/assuan-defs.h
@@ -39,9 +39,9 @@ struct cmdtbl_s
 struct assuan_io
 {
   /* Routine to read from input_fd.  */
-  ssize_t (*read) (ASSUAN_CONTEXT, void *, size_t);
+  ssize_t (*readfnc) (ASSUAN_CONTEXT, void *, size_t);
   /* Routine to write to output_fd.  */
-  ssize_t (*write) (ASSUAN_CONTEXT, const void *, size_t);
+  ssize_t (*writefnc) (ASSUAN_CONTEXT, const void *, size_t);
   /* Send a file descriptor.  */
   AssuanError (*sendfd) (ASSUAN_CONTEXT, int);
   /* Receive a file descriptor.  */