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/mischelp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/mischelp.h') diff --git a/common/mischelp.h b/common/mischelp.h index 0f865e2ef..df009ad5e 100644 --- a/common/mischelp.h +++ b/common/mischelp.h @@ -81,7 +81,7 @@ time_t timegm (struct tm *tm); /* Include hacks which are mainly required for Slowaris. */ -#ifdef JNLIB_NEED_AFLOCAL +#ifdef GNUPG_COMMON_NEED_AFLOCAL #ifndef HAVE_W32_SYSTEM # include # include @@ -115,7 +115,7 @@ time_t timegm (struct tm *tm); # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ + strlen ((ptr)->sun_path)) #endif /*SUN_LEN*/ -#endif /*JNLIB_NEED_AFLOCAL*/ +#endif /*GNUPG_COMMON_NEED_AFLOCAL*/ #endif /*LIBJNLIB_MISCHELP_H*/ -- cgit v1.2.3