diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/asshelp.c | 1 | ||||
| -rw-r--r-- | common/logging.c | 2 | ||||
| -rw-r--r-- | common/miscellaneous.c | 1 | ||||
| -rw-r--r-- | common/mischelp.h | 4 | ||||
| -rw-r--r-- | common/simple-pwquery.c | 6 | ||||
| -rw-r--r-- | common/simple-pwquery.h | 4 |
6 files changed, 5 insertions, 13 deletions
diff --git a/common/asshelp.c b/common/asshelp.c index 51ef17227..d7125ad22 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -37,7 +37,6 @@ #include <locale.h> #endif -#define JNLIB_NEED_LOG_LOGV #include "i18n.h" #include "util.h" #include "exechelp.h" diff --git a/common/logging.c b/common/logging.c index 9e7d55c34..66cd09a68 100644 --- a/common/logging.c +++ b/common/logging.c @@ -56,7 +56,7 @@ #include <assert.h> -#define JNLIB_NEED_AFLOCAL 1 +#define GNUPG_COMMON_NEED_AFLOCAL 1 #include "util.h" #include "i18n.h" #include "common-defs.h" diff --git a/common/miscellaneous.c b/common/miscellaneous.c index 862e952ea..95dbb670d 100644 --- a/common/miscellaneous.c +++ b/common/miscellaneous.c @@ -31,7 +31,6 @@ #include <stdlib.h> #include <errno.h> -#define JNLIB_NEED_LOG_LOGV #include "util.h" #include "iobuf.h" #include "i18n.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 <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*/ 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 diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h index 04ae1f04e..5ae696a6d 100644 --- a/common/simple-pwquery.h +++ b/common/simple-pwquery.h @@ -26,9 +26,7 @@ #include <gcrypt.h> #include "../common/logging.h" -/* Try to write error message using the standard log mechanism. The - current implementation requires that the HAVE_JNLIB_LOGGING is also - defined. */ +/* Try to write error message using the standard gnupg log mechanism. */ #define SPWQ_USE_LOGGING 1 /* Memory allocation functions used by the implementation. Note, that |