diff options
| author | Marcus Brinkmann <[email protected]> | 2007-07-04 21:07:27 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-07-04 21:07:27 +0000 |
| commit | 2d7cfe08b0654ba21a2455ace42eb316ef61725e (patch) | |
| tree | d22330fb84ff79b8c1428a4ed89a2f0c0e3d9417 | |
| parent | 2007-07-04 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-2d7cfe08b0654ba21a2455ace42eb316ef61725e.tar.gz gpgme-2d7cfe08b0654ba21a2455ace42eb316ef61725e.zip | |
2007-07-04 Marcus Brinkmann <[email protected]>
* assuan/Makefile.am (INCLUDES): Include $(top_srcdir)/gpgme. *
assuan/assuan.h: Include <ath.h> instead of trying to duplicate
the definitions.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | assuan/Makefile.am | 2 | ||||
| -rw-r--r-- | assuan/assuan.h | 15 | ||||
| -rw-r--r-- | gpgme/gpgme.h | 2 |
4 files changed, 8 insertions, 15 deletions
@@ -1,5 +1,9 @@ 2007-07-04 Marcus Brinkmann <[email protected]> + * 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/assuan/Makefile.am b/assuan/Makefile.am index e19a356e..dc5baf9c 100644 --- a/assuan/Makefile.am +++ b/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/assuan/assuan.h b/assuan/assuan.h index 5aa91854..9bad2582 100644 --- a/assuan/assuan.h +++ b/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/gpgme/gpgme.h b/gpgme/gpgme.h index a2086400..41e74914 100644 --- a/gpgme/gpgme.h +++ b/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" |