GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* assuan/Makefile.am (INCLUDES): Include $(top_srcdir)/gpgme.  *
	assuan/assuan.h: Include <ath.h> instead of trying to duplicate
	the definitions.
This commit is contained in:
Marcus Brinkmann 2007-07-04 21:07:27 +00:00
parent a63c5c0137
commit 2d7cfe08b0
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2007-07-04 Marcus Brinkmann <marcus@g10code.de> 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. * assuan/: Update files to 2007-07-04 version of assuan.
* autogen.sh: Use = not == in test. * autogen.sh: Use = not == in test.

2
assuan/Makefile.am
View File

@ -20,7 +20,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
EXTRA_DIST = mkerrors EXTRA_DIST = mkerrors
INCLUDES = -I.. -I$(top_srcdir)/include INCLUDES = -I.. -I$(top_srcdir)/gpgme
BUILT_SOURCES = assuan-errors.c BUILT_SOURCES = assuan-errors.c
MOSTLYCLEANFILES = assuan-errors.c MOSTLYCLEANFILES = assuan-errors.c

15
assuan/assuan.h
View File

@ -61,23 +61,12 @@
#define _ASSUAN_USE_DOUBLE_FORK #define _ASSUAN_USE_DOUBLE_FORK
#ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN #ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN
#include <ath.h>
int _gpgme_io_read (int fd, void *buffer, size_t count); 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_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_sendmsg (int sock, const struct msghdr *msg, int flags);
int _gpgme_io_recvmsg (int sock, 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 read _gpgme_io_read
#define write _gpgme_io_write #define write _gpgme_io_write

2
gpgme/gpgme.h
View File

@ -72,7 +72,7 @@ extern "C" {
AM_PATH_GPGME macro) check that this header matches the installed AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do library. Warning: Do not edit the next line. configure will do
that for you! */ that for you! */
#define GPGME_VERSION "1.1.5-cvs1213" #define GPGME_VERSION "1.1.5-cvs1219"