aboutsummaryrefslogtreecommitdiffstats
path: root/scd/iso7816.c
diff options
context:
space:
mode:
Diffstat (limited to 'scd/iso7816.c')
-rw-r--r--scd/iso7816.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/scd/iso7816.c b/scd/iso7816.c
index d9f3336c7..b09354f16 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -24,19 +24,10 @@
#include <string.h>
#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 "options.h"
-#include "errors.h"
-#include "memory.h"
-#include "../common/util.h"
-#include "../common/i18n.h"
-#else /* GNUPG_MAJOR_VERSION != 1 */
-#include "scdaemon.h"
-#endif /* GNUPG_MAJOR_VERSION != 1 */
+# include GNUPG_SCD_MAIN_HEADER
+#else
+# include "scdaemon.h"
+#endif /*!GNUPG_SCD_MAIN_HEADER*/
#include "iso7816.h"
#include "apdu.h"