diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ccid-driver.c | 10 | ||||
| -rw-r--r-- | scd/sc-copykeys.c | 1 | ||||
| -rw-r--r-- | scd/scdaemon.c | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index 151b371b4..4f0a4897e 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -108,12 +108,10 @@ #define CCID_MAX_BUF (2048+7+10) /* Depending on how this source is used we either define our error - output to go to stderr or to the jnlib based logging functions. We - use the latter when GNUPG_MAJOR_VERSION is defines or when both, - GNUPG_SCD_MAIN_HEADER and HAVE_JNLIB_LOGGING are defined. -*/ -#if defined(GNUPG_MAJOR_VERSION) \ - || (defined(GNUPG_SCD_MAIN_HEADER) && defined(HAVE_JNLIB_LOGGING)) + output to go to stderr or to the GnuPG based logging functions. We + use the latter when GNUPG_MAJOR_VERSION or GNUPG_SCD_MAIN_HEADER + are defined. */ +#if defined(GNUPG_MAJOR_VERSION) || defined(GNUPG_SCD_MAIN_HEADER) #if defined(GNUPG_SCD_MAIN_HEADER) # include GNUPG_SCD_MAIN_HEADER diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c index e503d3665..eb246c492 100644 --- a/scd/sc-copykeys.c +++ b/scd/sc-copykeys.c @@ -27,7 +27,6 @@ #include <sys/stat.h> #include <unistd.h> -#define JNLIB_NEED_LOG_LOGV #include "scdaemon.h" #include <gcrypt.h> diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 39925ce99..2cabee87d 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -37,8 +37,7 @@ #include <signal.h> #include <npth.h> -#define JNLIB_NEED_LOG_LOGV -#define JNLIB_NEED_AFLOCAL +#define GNUPG_COMMON_NEED_AFLOCAL #include "scdaemon.h" #include <ksba.h> #include <gcrypt.h> |