diff options
| author | Werner Koch <[email protected]> | 2019-07-12 10:49:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-07-12 11:39:47 +0000 |
| commit | fb1c8978f57b8f92e2ea9d10afc1d133656c9706 (patch) | |
| tree | a1578697779f9014f356d5b3e582f513424574a2 | |
| parent | doc: Dependencies for figures are only for maintainers. (diff) | |
| download | gnupg-fb1c8978f57b8f92e2ea9d10afc1d133656c9706.tar.gz gnupg-fb1c8978f57b8f92e2ea9d10afc1d133656c9706.zip | |
scd: Remove useless GNUPG_SCD_MAIN_HEADER macro.
* scd/apdu.c (): Remove never set and useless macro.
* scd/ccid-driver.c: Ditto.
* scd/iso7816.c: Ditto.
--
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | scd/apdu.c | 6 | ||||
| -rw-r--r-- | scd/ccid-driver.c | 11 | ||||
| -rw-r--r-- | scd/iso7816.c | 6 |
3 files changed, 7 insertions, 16 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 254c74101..2df113c5e 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -42,12 +42,10 @@ #include "rapdu.h" #endif /*USE_G10CODE_RAPDU*/ -#if defined(GNUPG_SCD_MAIN_HEADER) -# include GNUPG_SCD_MAIN_HEADER -#else /*!GNUPG_SCD_MAIN_HEADER*/ +#if defined(GNUPG_MAJOR_VERSION) # include "scdaemon.h" # include "../common/exechelp.h" -#endif /*!GNUPG_SCD_MAIN_HEADER*/ +#endif /*GNUPG_MAJOR_VERSION*/ #include "../common/host2net.h" diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index 45faa05bd..d762490c8 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -112,15 +112,10 @@ #define CCID_CMD_TIMEOUT (5*1000) /* Depending on how this source is used we either define our error - * output to go to the GnuPG based logging functions or to stderr. We - * use the former when GNUPG_MAJOR_VERSION or GNUPG_SCD_MAIN_HEADER is - * defined. */ -#if defined(GNUPG_MAJOR_VERSION) || defined(GNUPG_SCD_MAIN_HEADER) -# if defined(GNUPG_SCD_MAIN_HEADER) -# include GNUPG_SCD_MAIN_HEADER -# else /* This is the modularized GnuPG 1.9 or later. */ + * output to go to stderr or to the GnuPG based logging functions. We + * use the latter when GNUPG_MAJOR_VERSION is defined. */ +#if defined(GNUPG_MAJOR_VERSION) # include "scdaemon.h" -# endif # define DEBUGOUT(t) do { if (debug_level) \ log_debug (DRVNAME t); } while (0) diff --git a/scd/iso7816.c b/scd/iso7816.c index b09354f16..954aa3d4a 100644 --- a/scd/iso7816.c +++ b/scd/iso7816.c @@ -23,11 +23,9 @@ #include <stdlib.h> #include <string.h> -#if defined(GNUPG_SCD_MAIN_HEADER) -# include GNUPG_SCD_MAIN_HEADER -#else +#if defined(GNUPG_MAJOR_VERSION) # include "scdaemon.h" -#endif /*!GNUPG_SCD_MAIN_HEADER*/ +#endif /*GNUPG_MAJOR_VERSION*/ #include "iso7816.h" #include "apdu.h" |