diff options
| author | Werner Koch <wk@gnupg.org> | 2004-04-28 11:00:05 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-04-28 11:00:05 +0200 |
| commit | 4c96cb0683c4ff4e4b8d5ae9c61d555437ad51bd (patch) | |
| tree | 0aa2fc2094d468071eaf384ffb1ada643a55f491 | |
| parent | * gpgsm.c: New command --keydb-clear-some-cert-flags. (diff) | |
| download | gnupg2-4c96cb0683c4ff4e4b8d5ae9c61d555437ad51bd.tar.xz gnupg2-4c96cb0683c4ff4e4b8d5ae9c61d555437ad51bd.zip | |
* app-common.h: Do not include ksba.h for gnupg 1.
| -rw-r--r-- | scd/ChangeLog | 4 | ||||
| -rw-r--r-- | scd/app-common.h | 2 | ||||
| -rw-r--r-- | scd/app-openpgp.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 1db7a8a62..2233f223d 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,7 @@ +2004-04-27 Werner Koch <wk@gnupg.org> + + * app-common.h: Do not include ksba.h for gnupg 1. + 2004-04-26 Werner Koch <wk@gnupg.org> * app-common.h: New members FNC.DEINIT and APP_LOCAL. diff --git a/scd/app-common.h b/scd/app-common.h index 6e62bf99d..c61bcca60 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -21,7 +21,9 @@ #ifndef GNUPG_SCD_APP_COMMON_H #define GNUPG_SCD_APP_COMMON_H +#if GNUPG_MAJOR_VERSION != 1 #include <ksba.h> +#endif struct app_local_s; /* Defined by all app-*.c. */ diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 7ecbc6a48..07420c697 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -172,7 +172,6 @@ get_cached_data (app_t app, int tag, if (c) { memcpy (c->data, p, len); - log_debug (" caching tag %04X\n", tag); c->length = len; c->tag = tag; c->next = app->app_local->cache; |