diff options
| author | Werner Koch <wk@gnupg.org> | 2015-04-24 16:10:15 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-04-24 16:10:15 +0200 |
| commit | 575230d91bba95697518da418ea0e8712f889a0f (patch) | |
| tree | 382b577e91c4aa3b335481e6bf170ce0161fee7a /common/simple-pwquery.c | |
| parent | common: Remove libjnlib-config.h (jnlib merge). (diff) | |
| download | gnupg2-575230d91bba95697518da418ea0e8712f889a0f.tar.xz gnupg2-575230d91bba95697518da418ea0e8712f889a0f.zip | |
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 <wk@gnupg.org>
Diffstat (limited to 'common/simple-pwquery.c')
| -rw-r--r-- | common/simple-pwquery.c | 6 |
1 files changed, 1 insertions, 5 deletions
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 <locale.h> #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 |