diff options
| author | Werner Koch <[email protected]> | 2001-02-14 19:42:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2001-02-14 19:42:49 +0000 |
| commit | 04e0ea083aae051509b1fbd102dd3c4f236d8e11 (patch) | |
| tree | aa9b6f865dda7db4cbc4d46d2e00739ea703d936 | |
| parent | reap off gpg processes (diff) | |
| download | gpgme-04e0ea083aae051509b1fbd102dd3c4f236d8e11.tar.gz gpgme-04e0ea083aae051509b1fbd102dd3c4f236d8e11.zip | |
W32 fixes
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/rungpg.c | 2 | ||||
| -rw-r--r-- | gpgme/types.h | 5 | ||||
| -rw-r--r-- | tests/t-verify.c | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 7acb34c9..bcb71352 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,9 @@ 2001-02-13 Werner Koch <[email protected]> + * rungpg.c (struct reap_s): Replaced pid_t by int. + + * types.h: Add ulong typedef. + * rungpg.c (do_reaping,_gpgme_gpg_housecleaning): New. (_gpgme_gpg_release): Reap children. * io.h, posix-io.c (_gpgme_io_kill): New. diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c index 9b9e8ee8..261c71f7 100644 --- a/gpgme/rungpg.c +++ b/gpgme/rungpg.c @@ -118,7 +118,7 @@ struct gpg_object_s { struct reap_s { struct reap_s *next; - pid_t pid; + int pid; time_t entered; int term_send; }; diff --git a/gpgme/types.h b/gpgme/types.h index 38d83b2c..e5642e12 100644 --- a/gpgme/types.h +++ b/gpgme/types.h @@ -23,7 +23,12 @@ #include "gpgme.h" /* external objects and prototypes */ +#ifndef HAVE_BYTE_TYPEDEF typedef unsigned char byte; +#endif +#ifndef HAVE_ULONG_TYPEDEF +typedef unsigned long ulong; +#endif typedef enum { diff --git a/tests/t-verify.c b/tests/t-verify.c index 22ff1589..9372a7c6 100644 --- a/tests/t-verify.c +++ b/tests/t-verify.c @@ -111,7 +111,7 @@ print_sig_stat ( GpgmeCtx ctx, GpgmeSigStat status ) printf ("Verification Status: %s\n", status_string (status)); for(idx=0; (s=gpgme_get_sig_status (ctx, idx, &status, &created)); idx++ ) { - printf ("sig %d: created: %lu status: %s\n", idx, (ulong)created, + printf ("sig %d: created: %lu status: %s\n", idx, (unsigned long)created, status_string(status) ); printf ("sig %d: fpr/keyid=`%s'\n", idx, s ); if ( !gpgme_get_sig_key (ctx, idx, &key) ) { |