2003-08-18 Marcus Brinkmann <[email protected]>

	*configure.ac (AM_PATH_GPG_ERROR): Require 0.3.

assuan/
See README.1st.

gpgme/
2003-08-19  Marcus Brinkmann  <[email protected]>

	The ath files (ath.h, ath.c, ath-pth.c, ath-pthread.c,
	ath-compat.c, ath-pth-compat.c and ath-pthread-compat.c) have been
	updated to have better thread support, and the Makefile.am was
	changed to reflect that.

	* util.h [!HAVE_FOPENCOOKIE]: Remove fopencookie declaration.
	* engine-gpgsm.c (gpgsm_assuan_simple_command): Set ERR to return
	value of status_fnc.
	* rungpg.c (start): Return SAVED_ERRNO, not errno.

1 files changed, 17 insertions, 0 deletions

diff --git a/assuan/assuan-io.c b/assuan/assuan-io.c
index b10571be..5dca009d 100644
--- a/assuan/assuan-io.c
+++ b/assuan/assuan-io.c
@@ -22,6 +22,21 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifdef _ASSUAN_IN_GPGME
+ssize_t
+_assuan_simple_read (ASSUAN_CONTEXT ctx, void *buffer, size_t size)
+{
+  return read (ctx->inbound.fd, buffer, size);
+}
+
+ssize_t
+_assuan_simple_write (ASSUAN_CONTEXT ctx, const void *buffer, size_t size)
+{
+  return write (ctx->outbound.fd, buffer, size);
+}
+
+#else
+
 extern ssize_t pth_read (int fd, void *buffer, size_t size);
 extern ssize_t pth_write (int fd, const void *buffer, size_t size);
 
@@ -39,3 +54,5 @@ _assuan_simple_write (ASSUAN_CONTEXT ctx, const void *buffer, size_t size)
 {
   return (pth_write ? pth_write : write) (ctx->outbound.fd, buffer, size);
 }
+
+#endif