diff options
| author | Werner Koch <wk@gnupg.org> | 2019-05-16 08:24:29 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-05-16 08:24:42 +0200 |
| commit | 79c99921e35921140c83d7c101829d95f038f3da (patch) | |
| tree | fc7e6e6255f0d84f5e0b941c384a71ae3bccba5e /scd/ccid-driver.c | |
| parent | agent,scd: Scan and load all public keys for availability. (diff) | |
| download | gnupg2-79c99921e35921140c83d7c101829d95f038f3da.tar.xz gnupg2-79c99921e35921140c83d7c101829d95f038f3da.zip | |
scd: Remove unused cruft from GnuPG 1.x
* scd/apdu.c: Remove code used only by GnuPG 1.
* scd/app-openpgp.c: Ditto.
* scd/ccid-driver.c: Ditto.
* scd/iso7816.c: Ditto.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'scd/ccid-driver.c')
| -rw-r--r-- | scd/ccid-driver.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index dca8340ba..657766e30 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -112,22 +112,10 @@ #define CCID_CMD_TIMEOUT (5*1000) /* Depending on how this source is used we either define our error - output to go to stderr or to the GnuPG based logging functions. We - use the latter when GNUPG_MAJOR_VERSION or GNUPG_SCD_MAIN_HEADER - are defined. */ -#if defined(GNUPG_MAJOR_VERSION) || defined(GNUPG_SCD_MAIN_HEADER) - + * output to go to stderr or to the GnuPG based logging functions. We + * use the latter when GNUPG_SCD_MAIN_HEADER is defined. */ #if defined(GNUPG_SCD_MAIN_HEADER) -# include GNUPG_SCD_MAIN_HEADER -#elif GNUPG_MAJOR_VERSION == 1 /* GnuPG Version is < 1.9. */ -# include "options.h" -# include "util.h" -# include "memory.h" -# include "cardglue.h" -# else /* This is the modularized GnuPG 1.9 or later. */ -# include "scdaemon.h" -#endif - +# include GNUPG_SCD_MAIN_HEADER # define DEBUGOUT(t) do { if (debug_level) \ log_debug (DRVNAME t); } while (0) @@ -173,7 +161,7 @@ # define DEBUGOUT_LF() do { if (debug_level) \ putc ('\n', stderr); } while (0) -#endif /* This source not used by scdaemon. */ +#endif /* This source is not used by scdaemon. */ #ifndef EAGAIN |