aboutsummaryrefslogtreecommitdiffstats
path: root/common/mischelp.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-04-24 14:10:15 +0000
committerWerner Koch <[email protected]>2015-04-24 14:10:15 +0000
commit575230d91bba95697518da418ea0e8712f889a0f (patch)
tree382b577e91c4aa3b335481e6bf170ce0161fee7a /common/mischelp.h
parentcommon: Remove libjnlib-config.h (jnlib merge). (diff)
downloadgnupg-575230d91bba95697518da418ea0e8712f889a0f.tar.gz
gnupg-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 <[email protected]>
Diffstat (limited to 'common/mischelp.h')
-rw-r--r--common/mischelp.h4
1 files changed, 2 insertions, 2 deletions
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 <sys/socket.h>
# include <sys/un.h>
@@ -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*/