From 575230d91bba95697518da418ea0e8712f889a0f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 24 Apr 2015 16:10:15 +0200 Subject: common: Remove two JNLIB_ macros (jnlib merge). * configure.ac: Merge seperate jnlib checks. (HAVE_JNLIB_LOGGING): Remove. * common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL): Rename to GNUPG_COMMON_NEED_AFLOCAL. Change all tests. -- Signed-off-by: Werner Koch --- common/simple-pwquery.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'common/simple-pwquery.c') diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c index d1b298061..90d04c08a 100644 --- a/common/simple-pwquery.c +++ b/common/simple-pwquery.c @@ -40,7 +40,7 @@ #include #endif -#define JNLIB_NEED_AFLOCAL +#define GNUPG_COMMON_NEED_AFLOCAL #include "../common/mischelp.h" #ifdef HAVE_W32_SYSTEM #include "../common/w32-afunix.h" @@ -50,10 +50,6 @@ #define SIMPLE_PWQUERY_IMPLEMENTATION 1 #include "simple-pwquery.h" -#if defined(SPWQ_USE_LOGGING) && !defined(HAVE_JNLIB_LOGGING) -# undef SPWQ_USE_LOGGING -#endif - #ifndef _ #define _(a) (a) #endif -- cgit v1.2.3