diff options
| -rw-r--r-- | gpgme/ChangeLog | 7 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 2 | ||||
| -rw-r--r-- | gpgme/engine.h | 3 | ||||
| -rw-r--r-- | gpgme/rungpg.c | 2 | ||||
| -rw-r--r-- | gpgme/types.h | 12 |
5 files changed, 14 insertions, 12 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index f6692e3a..e309509d 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,12 @@ 2003-01-30 Marcus Brinkmann <[email protected]> + * types.h (EngineObject): Move typedef to ... + * engine.h: ... here. + * types.h (GpgObject): Move typedef to ... + * rungpg.c: ... here. + * types.h (GpgsmObject): Move typedef to ... + * engine-gpgsm.c: ... here. + * util.h (return_if_fail, return_null_if_fail, return_val_if_fail): Remove macro. * gpgme.c (gpgme_cancel): Don't use return_if_fail. diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 38c2c0f1..82d719a1 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -97,7 +97,9 @@ struct gpgsm_object_s struct GpgmeIOCbs io_cbs; }; +typedef struct gpgsm_object_s *GpgsmObject; + static const char * gpgsm_get_version (void) { diff --git a/gpgme/engine.h b/gpgme/engine.h index de782dad..a56ec85f 100644 --- a/gpgme/engine.h +++ b/gpgme/engine.h @@ -23,6 +23,9 @@ #include "types.h" +struct engine_object_s; +typedef struct engine_object_s *EngineObject; + GpgmeError _gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine); void _gpgme_engine_release (EngineObject engine); void _gpgme_engine_set_status_handler (EngineObject engine, diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c index ca1cb0bf..2b0e4d3d 100644 --- a/gpgme/rungpg.c +++ b/gpgme/rungpg.c @@ -123,7 +123,9 @@ struct gpg_object_s struct GpgmeIOCbs io_cbs; }; +typedef struct gpg_object_s *GpgObject; + static void gpg_io_event (void *engine, GpgmeEventIO type, void *type_data) { diff --git a/gpgme/types.h b/gpgme/types.h index 30ed7246..90d71296 100644 --- a/gpgme/types.h +++ b/gpgme/types.h @@ -32,18 +32,6 @@ typedef GpgmeError (*GpgmeCommandHandler) (void*, GpgmeStatusCode code, const char *keyword, const char **result); -/*-- engine.c --*/ -struct engine_object_s; -typedef struct engine_object_s *EngineObject; - -/*-- engine-gpgsm.c --*/ -struct gpgsm_object_s; -typedef struct gpgsm_object_s *GpgsmObject; - -/*-- rungpg.c --*/ -struct gpg_object_s; -typedef struct gpg_object_s *GpgObject; - /*-- verify.c --*/ struct verify_result_s; typedef struct verify_result_s *VerifyResult; |