2007-07-04 Marcus Brinkmann <marcus@g10code.de>

	* assuan/Makefile.am (INCLUDES): Include $(top_srcdir)/gpgme.  *
	assuan/assuan.h: Include <ath.h> instead of trying to duplicate
	the definitions.

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index e3a2e2e3039ee2fe23bca589153697b4e5f4ae86..9e052949fdbfd89c1e73d28abbaa81ea936eedb6 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-04  Marcus Brinkmann  <marcus@g10code.de>
 
+       * assuan/Makefile.am (INCLUDES): Include $(top_srcdir)/gpgme.  *
+       assuan/assuan.h: Include <ath.h> instead of trying to duplicate
+       the definitions.
+       
        * assuan/: Update files to 2007-07-04 version of assuan.
 
        * autogen.sh: Use = not == in test.

diff --git a/trunk/assuan/Makefile.am b/trunk/assuan/Makefile.am
index e19a356e7a5e8d3813b7babd105dc0bca155f55e..dc5baf9c5a46b71cb103c5a6780d8b8d2b6fd54a 100644 (file)
--- a/trunk/assuan/Makefile.am
+++ b/trunk/assuan/Makefile.am
@@ -20,7 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/include
+INCLUDES = -I.. -I$(top_srcdir)/gpgme
 BUILT_SOURCES = assuan-errors.c
 MOSTLYCLEANFILES = assuan-errors.c
 

diff --git a/trunk/assuan/assuan.h b/trunk/assuan/assuan.h
index 5aa918548521be10698bec21bf690e60a98b2e8d..9bad25821e41396b2fd3dd29a06c0db4296c624d 100644 (file)
--- a/trunk/assuan/assuan.h
+++ b/trunk/assuan/assuan.h
@@ -61,23 +61,12 @@
 #define _ASSUAN_USE_DOUBLE_FORK
 
 #ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN
+#include <ath.h>
+
 int _gpgme_io_read (int fd, void *buffer, size_t count);
 int _gpgme_io_write (int fd, const void *buffer, size_t count);
-ssize_t _gpgme_ath_waitpid (pid_t pid, int *status, int options);
-#ifdef HAVE_W32_SYSTEM
-int _gpgme_ath_accept (int s, void *addr, int *length_ptr);
-#else /*!HAVE_W32_SYSTEM*/
-struct sockaddr;
-struct msghdr;
-ssize_t _gpgme_ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
-                           struct timeval *timeout);
-int _gpgme_ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr);
-int _gpgme_ath_connect (int s, struct sockaddr *addr, socklen_t length);
-int _gpgme_ath_sendmsg (int s, const struct msghdr *msg, int flags);
-int _gpgme_ath_recvmsg (int s, struct msghdr *msg, int flags);
 int _gpgme_io_sendmsg (int sock, const struct msghdr *msg, int flags);
 int _gpgme_io_recvmsg (int sock, struct msghdr *msg, int flags);
-#endif /*!HAVE_W32_SYSTEM*/
 
 #define read          _gpgme_io_read
 #define write         _gpgme_io_write

diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index a2086400ec950a6977910381f2544bb2cec686d5..41e749145f345618c67e766ef64b88c21d21773c 100644 (file)
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -72,7 +72,7 @@ extern "C" {
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "1.1.5-cvs1213"
+#define GPGME_VERSION "1.1.5-cvs1219"
 
 
 \f