From 6d0d8e7ba0bb989c251545fa8af35b97d1a703ba Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 25 Apr 2013 12:00:16 +0100 Subject: Make definition of off_t robust against misbehaving w32 toolchains. * configure.ac (NEED__FILE_OFFSET_BITS): Change to define gpgme_off_t and gpgme_ssize_t. (API__OFF_T, API__SSIZE_T): New ac_subst. * src/gpgme.h.in: Replace all ssize_t and off_t by ac_subst macros. * src/assuan-support.c, src/ath-pthread.c, src/ath.c, src/ath.h * src/data-compat.c, src/data-fd.c, src/data-mem.c, src/data-stream.c * src/data-user.c, src/data.c, src/data.h, src/engine-gpgsm.c * src/engine-uiserver.c, src/gpgme-tool.c, src/gpgme.c: Replace off_t by gpgme_off_t and sszie_t by gpgme_ssize_t. * src/ath-pthread.c, src/ath.h: Include gpgme.h. -- For a detailed description, see the gpgme.texi diff. --- src/gpgme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpgme.c') diff --git a/src/gpgme.c b/src/gpgme.c index 281ba9cf..a8de64b4 100644 --- a/src/gpgme.c +++ b/src/gpgme.c @@ -643,7 +643,7 @@ gpgme_set_io_cbs (gpgme_ctx_t ctx, gpgme_io_cbs_t io_cbs) /* This function provides access to the internal read function; it is normally not used. */ -ssize_t +gpgme_ssize_t gpgme_io_read (int fd, void *buffer, size_t count) { int ret; @@ -659,7 +659,7 @@ gpgme_io_read (int fd, void *buffer, size_t count) /* This function provides access to the internal write function. It is to be used by user callbacks to return data to gpgme. See gpgme_passphrase_cb_t and gpgme_edit_cb_t. */ -ssize_t +gpgme_ssize_t gpgme_io_write (int fd, const void *buffer, size_t count) { int ret; -- cgit v1.2.3