diff options
| author | Werner Koch <[email protected]> | 2013-04-25 11:00:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-05-16 15:48:50 +0000 |
| commit | 6d0d8e7ba0bb989c251545fa8af35b97d1a703ba (patch) | |
| tree | 9350cede809e12536956f6487c92d3f2d9489d66 /src/gpgme-tool.c | |
| parent | w32: Change the way the I/O threads are cleaned up. (diff) | |
| download | gpgme-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/gpgme-tool.c')
| -rw-r--r-- | src/gpgme-tool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index 978c387d..bce52b82 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -3056,7 +3056,7 @@ _cmd_genkey_write (gpgme_data_t data, const void *buf, size_t size) { while (size > 0) { - ssize_t writen = gpgme_data_write (data, buf, size); + gpgme_ssize_t writen = gpgme_data_write (data, buf, size); if (writen < 0 && errno != EAGAIN) return gpg_error_from_syserror (); else if (writen > 0) @@ -3112,7 +3112,7 @@ cmd_genkey (assuan_context_t ctx, char *line) do { char buf[512]; - ssize_t readn = gpgme_data_read (inp_data, buf, sizeof (buf)); + gpgme_ssize_t readn = gpgme_data_read (inp_data, buf, sizeof (buf)); if (readn < 0) { err = gpg_error_from_syserror (); |