W32 fixes

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 7acb34c9cb19d4f365a2e6632e628e1174f59969..bcb713529540cff9e7306ea000da61f7af38d6a5 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,5 +1,9 @@
 2001-02-13  Werner Koch  <wk@gnupg.org>
 
+       * 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/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 9b9e8ee8ed39512b175ff581593a1164583927bf..261c71f76af558882308376f38e1126fbb5946d8 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/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/trunk/gpgme/types.h b/trunk/gpgme/types.h
index 38d83b2c7b055160e95222601628aacb58f32023..e5642e1290e9f466b9a5ef4d5d91c72333d18255 100644 (file)
--- a/trunk/gpgme/types.h
+++ b/trunk/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/trunk/tests/t-verify.c b/trunk/tests/t-verify.c
index 22ff1589e3646f92744263f7b166ed52b70a30d7..9372a7c601a8dc8da58f5717d0d072856139d4a9 100644 (file)
--- a/trunk/tests/t-verify.c
+++ b/trunk/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) ) {