From 2536bf276189a474a3a1ca9716368cf5d991b0d6 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 11 Jul 2019 13:21:48 +0900 Subject: scd: Fix debug logging of the internal CCID driver. * scd/ccid-driver.c [GNUPG_MAJOR_VERSION] (DEBUGOUT): Use log_debug. Fixes-commit: 79c99921e35921140c83d7c101829d95f038f3da Signed-off-by: NIIBE Yutaka --- scd/ccid-driver.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index f791c3ad5..789774606 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -112,10 +112,15 @@ #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_SCD_MAIN_HEADER is defined. */ -#if defined(GNUPG_SCD_MAIN_HEADER) -# include GNUPG_SCD_MAIN_HEADER + * 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. */ +# include "scdaemon.h" +# endif # define DEBUGOUT(t) do { if (debug_level) \ log_debug (DRVNAME t); } while (0) -- cgit v1.2.3