gpgme-1-0-branch gpgme/assuan (ChangeLog assuan-buffer.c assuan-defs.h)

[cvs user wk]

    Date: Tuesday, March 22, 2005 @ 10:11:28
  Author: wk
    Path: /cvs/gpgme/gpgme/assuan
     Tag: gpgme-1-0-branch

Modified: ChangeLog assuan-buffer.c 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ä.


-----------------+
 ChangeLog       |    6 ++++++
 assuan-buffer.c |    4 ++--
 assuan-defs.h   |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)


Index: gpgme/assuan/ChangeLog
diff -u gpgme/assuan/ChangeLog:1.22.2.2 gpgme/assuan/ChangeLog:1.22.2.3
--- gpgme/assuan/ChangeLog:1.22.2.2	Tue Dec 21 09:44:27 2004
+++ gpgme/assuan/ChangeLog	Tue Mar 22 10:11:28 2005
@@ -1,3 +1,9 @@
+2005-03-22  Werner Koch  <wk at 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 at g10code.de>
 
 	* assuan-pipe-connect.c (do_finish): Do not wait for child to finish.
Index: gpgme/assuan/assuan-buffer.c
diff -u gpgme/assuan/assuan-buffer.c:1.10 gpgme/assuan/assuan-buffer.c:1.10.2.1
--- gpgme/assuan/assuan-buffer.c:1.10	Tue Jun  8 19:48:37 2004
+++ gpgme/assuan/assuan-buffer.c	Tue Mar 22 10:11:28 2005
@@ -32,7 +32,7 @@
 {
   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 @@
   *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)
         {
Index: gpgme/assuan/assuan-defs.h
diff -u gpgme/assuan/assuan-defs.h:1.8 gpgme/assuan/assuan-defs.h:1.8.2.1
--- gpgme/assuan/assuan-defs.h:1.8	Mon Aug 18 21:17:07 2003
+++ gpgme/assuan/assuan-defs.h	Tue Mar 22 10:11:28 2005
@@ -39,9 +39,9 @@
 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.  */