[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.3-15-gddd54d8

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  ddd54d821020125f777c192e499d6967d02e3322 (commit)
      from  6391de3e62a275132664ae96497dd4e47fe9f257 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ddd54d821020125f777c192e499d6967d02e3322
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 8 13:27:06 2017 +0100

    Revert: build: Do not define logging.h constants for ...
    
    ---
    
    This reverts commit 2fedf8583bcc493f587c90bc9632d25dfd10bd10.
    
    We better solve this on the libgpg-error side.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/logging.h b/common/logging.h
index c6a32b4..e1bf56b 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -70,21 +70,15 @@ estream_t log_get_stream (void);
    : _log_assert (#expr, __FILE__, __LINE__))
 #endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
 
+/* Flag values for log_set_prefix. */
+#define GPGRT_LOG_WITH_PREFIX  1
+#define GPGRT_LOG_WITH_TIME    2
+#define GPGRT_LOG_WITH_PID     4
+#define GPGRT_LOG_RUN_DETACHED 256
+#define GPGRT_LOG_NO_REGISTRY  512
 
-/* If we use an older libgpg-error we need to define the constants
- * which will be used by current libgpg-error development
- * versions.  */
-#ifndef GPGRT_LOG_WITH_PREFIX
-
-  /* Flag values for log_set_prefix. */
-# define GPGRT_LOG_WITH_PREFIX  1
-# define GPGRT_LOG_WITH_TIME    2
-# define GPGRT_LOG_WITH_PID     4
-# define GPGRT_LOG_RUN_DETACHED 256
-# define GPGRT_LOG_NO_REGISTRY  512
-
-  /* Log levels as used by log_log.  */
-  enum jnlib_log_levels {
+/* Log levels as used by log_log.  */
+enum jnlib_log_levels {
     GPGRT_LOG_BEGIN,
     GPGRT_LOG_CONT,
     GPGRT_LOG_INFO,
@@ -93,9 +87,7 @@ estream_t log_get_stream (void);
     GPGRT_LOG_FATAL,
     GPGRT_LOG_BUG,
     GPGRT_LOG_DEBUG
-  };
-#endif /* Old libgpg-error.  */
-
+};
 void log_log (int level, const char *fmt, ...) GPGRT_ATTR_PRINTF(2,3);
 void log_logv (int level, const char *fmt, va_list arg_ptr);
 void log_logv_with_prefix (int level, const char *prefix,

-----------------------------------------------------------------------

Summary of changes:
 common/logging.h | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org