security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-29 21:58:04 +02:00
Code Activity

scd: Remove useless GNUPG_SCD_MAIN_HEADER macro.

Browse Source 
* scd/apdu.c (): Remove never set and useless macro.
* scd/ccid-driver.c: Ditto.
* scd/iso7816.c: Ditto.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-07-12 12:49:12 +02:00
parent 58bab1a878
commit fb1c8978f5
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scd/apdu.c
View File

@ -42,12 +42,10 @@
#include "rapdu.h" #include "rapdu.h"
#endif /*USE_G10CODE_RAPDU*/ #endif /*USE_G10CODE_RAPDU*/
#if defined(GNUPG_SCD_MAIN_HEADER) #if defined(GNUPG_MAJOR_VERSION)
# include GNUPG_SCD_MAIN_HEADER
#else /*!GNUPG_SCD_MAIN_HEADER*/
# include "scdaemon.h" # include "scdaemon.h"
# include "../common/exechelp.h" # include "../common/exechelp.h"
#endif /*!GNUPG_SCD_MAIN_HEADER*/ #endif /*GNUPG_MAJOR_VERSION*/
#include "../common/host2net.h" #include "../common/host2net.h"

11
scd/ccid-driver.c
View File

@ -112,15 +112,10 @@
#define CCID_CMD_TIMEOUT (5*1000) #define CCID_CMD_TIMEOUT (5*1000)
/* Depending on how this source is used we either define our error /* 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 * output to go to stderr or to the GnuPG based logging functions. We
* use the former when GNUPG_MAJOR_VERSION or GNUPG_SCD_MAIN_HEADER is * use the latter when GNUPG_MAJOR_VERSION is defined. */
* defined. */ #if defined(GNUPG_MAJOR_VERSION)
#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. */
# include "scdaemon.h" # include "scdaemon.h"
# endif
# define DEBUGOUT(t) do { if (debug_level) \ # define DEBUGOUT(t) do { if (debug_level) \
log_debug (DRVNAME t); } while (0) log_debug (DRVNAME t); } while (0)

6
scd/iso7816.c
View File

@ -23,11 +23,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(GNUPG_SCD_MAIN_HEADER) #if defined(GNUPG_MAJOR_VERSION)
# include GNUPG_SCD_MAIN_HEADER
#else
# include "scdaemon.h" # include "scdaemon.h"
#endif /*!GNUPG_SCD_MAIN_HEADER*/ #endif /*GNUPG_MAJOR_VERSION*/
#include "iso7816.h" #include "iso7816.h"
#include "apdu.h" #include "apdu.h"