diff options
Diffstat (limited to 'dirmngr')
| -rw-r--r-- | dirmngr/dirmngr-client.c | 2 | ||||
| -rw-r--r-- | dirmngr/dirmngr.c | 12 | ||||
| -rw-r--r-- | dirmngr/dirmngr_ldap.c | 4 | ||||
| -rw-r--r-- | dirmngr/ks-engine.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c index 5938ed2ec..29e29b509 100644 --- a/dirmngr/dirmngr-client.c +++ b/dirmngr/dirmngr-client.c @@ -183,7 +183,7 @@ main (int argc, char **argv ) early_system_init (); set_strusage (my_strusage); log_set_prefix ("dirmngr-client", - JNLIB_LOG_WITH_PREFIX); + GPGRT_LOG_WITH_PREFIX); /* For W32 we need to initialize the socket subsystem. Becuase we don't use Pth we need to do this explicit. */ diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 504b13eaf..3375a4a2f 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1040,9 +1040,9 @@ main (int argc, char **argv) if (logfile) { log_set_file (logfile); - log_set_prefix (NULL, (JNLIB_LOG_WITH_PREFIX - |JNLIB_LOG_WITH_TIME - |JNLIB_LOG_WITH_PID)); + log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX + |GPGRT_LOG_WITH_TIME + |GPGRT_LOG_WITH_PID)); current_logfile = xstrdup (logfile); } @@ -1211,7 +1211,7 @@ main (int argc, char **argv) } log_get_prefix (&oldflags); - log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); + log_set_prefix (NULL, oldflags | GPGRT_LOG_RUN_DETACHED); opt.running_detached = 1; if (chdir("/")) @@ -1825,7 +1825,7 @@ housekeeping_thread (void *arg) } -#if JNLIB_GCC_HAVE_PUSH_PRAGMA +#if GPGRT_GCC_HAVE_PUSH_PRAGMA # pragma GCC push_options # pragma GCC optimize ("no-strict-overflow") #endif @@ -1845,7 +1845,7 @@ time_for_housekeeping_p (time_t curtime) } return 0; } -#if JNLIB_GCC_HAVE_PUSH_PRAGMA +#if GPGRT_GCC_HAVE_PUSH_PRAGMA # pragma GCC pop_options #endif diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index b4c9bda4a..61a7e390e 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -245,7 +245,7 @@ ldap_wrapper_main (char **argv, estream_t outstream) #ifdef USE_LDAPWRAPPER set_strusage (my_strusage); - log_set_prefix ("dirmngr_ldap", JNLIB_LOG_WITH_PREFIX); + log_set_prefix ("dirmngr_ldap", GPGRT_LOG_WITH_PREFIX); /* Setup I18N and common subsystems. */ i18n_init(); @@ -297,7 +297,7 @@ ldap_wrapper_main (char **argv, estream_t outstream) { unsigned int oldflags; log_get_prefix (&oldflags); - log_set_prefix (NULL, oldflags | JNLIB_LOG_WITH_PID); + log_set_prefix (NULL, oldflags | GPGRT_LOG_WITH_PID); } break; diff --git a/dirmngr/ks-engine.h b/dirmngr/ks-engine.h index 5bfe29b2b..985167aa3 100644 --- a/dirmngr/ks-engine.h +++ b/dirmngr/ks-engine.h @@ -26,7 +26,7 @@ /*-- ks-action.c --*/ gpg_error_t ks_print_help (ctrl_t ctrl, const char *text); gpg_error_t ks_printf_help (ctrl_t ctrl, const char *format, - ...) JNLIB_GCC_A_PRINTF(2,3); + ...) GPGRT_GCC_A_PRINTF(2,3); /*-- ks-engine-hkp.c --*/ gpg_error_t ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri); |