aboutsummaryrefslogtreecommitdiffstats
path: root/src/data-stream.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2013-04-25 11:00:16 +0000
committerWerner Koch <[email protected]>2013-05-16 15:48:50 +0000
commit6d0d8e7ba0bb989c251545fa8af35b97d1a703ba (patch)
tree9350cede809e12536956f6487c92d3f2d9489d66 /src/data-stream.c
parentw32: Change the way the I/O threads are cleaned up. (diff)
downloadgpgme-6d0d8e7ba0bb989c251545fa8af35b97d1a703ba.tar.gz
gpgme-6d0d8e7ba0bb989c251545fa8af35b97d1a703ba.zip
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.
Diffstat (limited to 'src/data-stream.c')
-rw-r--r--src/data-stream.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/data-stream.c b/src/data-stream.c
index a9bb815b..f358a0e0 100644
--- a/src/data-stream.c
+++ b/src/data-stream.c
@@ -31,7 +31,7 @@
#include "data.h"
-static ssize_t
+static gpgme_ssize_t
stream_read (gpgme_data_t dh, void *buffer, size_t size)
{
size_t amt = fread (buffer, 1, size, dh->data.stream);
@@ -41,7 +41,7 @@ stream_read (gpgme_data_t dh, void *buffer, size_t size)
}
-static ssize_t
+static gpgme_ssize_t
stream_write (gpgme_data_t dh, const void *buffer, size_t size)
{
size_t amt = fwrite (buffer, 1, size, dh->data.stream);
@@ -51,8 +51,8 @@ stream_write (gpgme_data_t dh, const void *buffer, size_t size)
}
-static off_t
-stream_seek (gpgme_data_t dh, off_t offset, int whence)
+static gpgme_off_t
+stream_seek (gpgme_data_t dh, gpgme_off_t offset, int whence)
{
int err;