aboutsummaryrefslogtreecommitdiffstats
path: root/assuan/assuan.h
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2007-07-16 17:26:09 +0000
committerMarcus Brinkmann <[email protected]>2007-07-16 17:26:09 +0000
commitb3434696b380921d5d0be8ffdf1e19ca938fe572 (patch)
tree7d071e655ac7a168a55729da7fd7b5cc93c10672 /assuan/assuan.h
parent2007-07-13 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-b3434696b380921d5d0be8ffdf1e19ca938fe572.tar.gz
gpgme-b3434696b380921d5d0be8ffdf1e19ca938fe572.zip
2007-07-16 Marcus Brinkmann <[email protected]>
* assuan/assuan-socket.c (_assuan_close): Always use close(). * assuan/assuan.h (_gpgme_io_close): New prototype. (close): New macro, define as _gpgme_io_close. gpgme/ 2007-07-16 Marcus Brinkmann <[email protected]> * w32-io.c (struct reader_context_s, struct writer_context_s): New members REFCOUNT. (create_reader, create_writer): Initialize C->refcount to 1. (destroy_reader, destroy_writer): Only destroy if C->refcount drops to 0. (find_reader, find_writer, kill_reader, kill_writer): Beautify. * priv-io.h (_gpgme_io_dup): New prototype. * posix-io.c (_gpgme_io_dup): New function. * w32-io.c (_gpgme_io_dup): Likewise. * w32-glib-io.c (_gpgme_io_dup): Likewise. * engine-gpgsm.c (start): Reverting to version 2007-07-10.
Diffstat (limited to '')
-rw-r--r--assuan/assuan.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/assuan/assuan.h b/assuan/assuan.h
index 33f14cf0..fd807959 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -63,11 +63,13 @@
#ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN
#include <ath.h>
+int _gpgme_io_close (int fd);
int _gpgme_io_read (int fd, void *buffer, size_t count);
int _gpgme_io_write (int fd, const void *buffer, size_t count);
int _gpgme_io_sendmsg (int sock, const struct msghdr *msg, int flags);
int _gpgme_io_recvmsg (int sock, struct msghdr *msg, int flags);
+#define close _gpgme_io_close
#define read _gpgme_io_read
#define write _gpgme_io_write
#define waitpid _gpgme_ath_waitpid