From 26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 24 Apr 2015 15:49:18 +0200 Subject: common: Rename log and gcc attribute macros (jnlib merge). * common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*. * common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*. -- JNLIB has no more meaning. Thus we switch to a GPGRT_ prefix in anticipation that some code may eventually be moved to libgpg-error. Signed-off-by: Werner Koch --- dirmngr/dirmngr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dirmngr/dirmngr.c') 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 -- cgit v1.2.3