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/apdu.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/apdu.c')
| -rw-r--r-- | scd/apdu.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 816938ac5..ffa28c689 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -43,22 +43,12 @@ #endif /*USE_G10CODE_RAPDU*/ #if defined(GNUPG_SCD_MAIN_HEADER) -#include GNUPG_SCD_MAIN_HEADER -#elif GNUPG_MAJOR_VERSION == 1 -/* This is used with GnuPG version < 1.9. The code has been source - copied from the current GnuPG >= 1.9 and is maintained over - there. */ -#include "../common/options.h" -#include "errors.h" -#include "memory.h" -#include "../common/util.h" -#include "../common/i18n.h" -#include "dynload.h" -#include "cardglue.h" -#else /* GNUPG_MAJOR_VERSION != 1 */ -#include "scdaemon.h" -#include "../common/exechelp.h" -#endif /* GNUPG_MAJOR_VERSION != 1 */ +# include GNUPG_SCD_MAIN_HEADER +#else /*!GNUPG_SCD_MAIN_HEADER*/ +# include "scdaemon.h" +# include "../common/exechelp.h" +#endif /*!GNUPG_SCD_MAIN_HEADER*/ + #include "../common/host2net.h" #include "iso7816.h" |