diff options
Diffstat (limited to '')
| -rw-r--r-- | scd/ChangeLog | 10 | ||||
| -rw-r--r-- | scd/app-common.h | 2 | ||||
| -rw-r--r-- | scd/tlv.c | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 64a4a8b72..ea1b0d287 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,13 @@ +2005-05-31 Werner Koch <[email protected]> + + * tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of + including a gnupg 1.4 header. + +2005-05-30 Werner Koch <[email protected]> + + * tlv.c: Add hack to compile without gpg-error.h when used with + GnuPG 1.4. + 2005-05-23 Werner Koch <[email protected]> * Makefile.am: Do not build sc-copykeys anymore. diff --git a/scd/app-common.h b/scd/app-common.h index 613ad61f6..812736ece 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -45,7 +45,7 @@ struct app_ctx_s { in case we need to divert the operation to an already running agent. This if ASSUAN_CTX is not NULL we take this as indication that all operations are diverted to gpg-agent. */ -#if GNUPG_MAJOR_VERSION == 1 && defined(ENABLE_AGENT_SUPPORT) +#if GNUPG_MAJOR_VERSION == 1 assuan_context_t assuan_ctx; #endif /*GNUPG_MAJOR_VERSION == 1*/ @@ -25,7 +25,15 @@ #include <string.h> #include <assert.h> +#if GNUPG_MAJOR_VERSION == 1 +#define GPG_ERR_EOF (-1) +#define GPG_ERR_BAD_BER (1) /*G10ERR_GENERAL*/ +#define GPG_ERR_INV_SEXP (45) /*G10ERR_INV_ARG*/ +typedef int gpg_error_t; +#define gpg_error(n) (n) +#else #include <gpg-error.h> +#endif #include "tlv.h" |