diff options
author | Marcus Brinkmann <[email protected]> | 2009-06-22 14:50:17 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2009-06-22 14:50:17 +0000 |
commit | 1c454aee81e38ffbc4a615092742ae4b1e37b57f (patch) | |
tree | fa9b1896ce8bf617b6712ba95620e811d0abb9ef /src/priv-io.h | |
parent | 2009-06-18 Marcus Brinkmann <[email protected]> (diff) | |
download | gpgme-1c454aee81e38ffbc4a615092742ae4b1e37b57f.tar.gz gpgme-1c454aee81e38ffbc4a615092742ae4b1e37b57f.zip |
2009-06-22 Marcus Brinkmann <[email protected]>
* configure.ac: Add AC_TYPE_UINTPTR_T.
* assuan/assuan.h [_ASSUAN_IN_GPGME_BUILD_ASSUAN]: Declare
_gpgme_io_connect.
src/
2009-06-22 Marcus Brinkmann <[email protected]>
* debug.h: Everywhere, use %p instead of 0x%x to print pointer.
[HAVE_STDINT_H]: Include <stdint.h>.
(_TRACE, TRACE, TRACE0, TRACE1, TRACE2, TRACE3, TRACE6): Cast tag
to (uintptr_t) before casting it to (void*) to silence GCC
warning.
* gpgme.h.in (_GPGME_DEPRECATED_OUTSIDE_GPGME): New macro.
* sign.c (_GPGME_IN_GPGME): Define it.
* keylist.c (_GPGME_IN_GPGME): Define it.
* debug.c (_gpgme_debug_begin, _gpgme_debug_add): Handle error in
vasprintf and asprintf.
* priv-io.h: Include <sys/socket.h>. Declare _gpgme_io_connect.
tests/
2009-06-22 Marcus Brinkmann <[email protected]>
* gpg/t-support.h (passphrase_cb): Implement write() according to
the book to silence compiler warning.
* gpgsm/t-support.h (passphrase_cb): Likewise.
Diffstat (limited to 'src/priv-io.h')
-rw-r--r-- | src/priv-io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/priv-io.h b/src/priv-io.h index 7194a424..3f2f96ac 100644 --- a/src/priv-io.h +++ b/src/priv-io.h @@ -22,6 +22,7 @@ #ifndef IO_H #define IO_H +#include <sys/socket.h> /* A single file descriptor passed to spawn. For child fds, dup_to specifies the fd it should become in the child, but only 0, 1 and 2 @@ -50,6 +51,7 @@ struct io_select_fd_s /* These function are either defined in posix-io.c or w32-io.c. */ void _gpgme_io_subsystem_init (void); +int _gpgme_io_connect (int fd, struct sockaddr *addr, int addrlen); 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_pipe (int filedes[2], int inherit_idx); |