diff options
| author | Werner Koch <[email protected]> | 2017-12-08 12:27:06 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-12-08 12:27:36 +0000 |
| commit | ddd54d821020125f777c192e499d6967d02e3322 (patch) | |
| tree | 44cbe5c7fc20ca298e3b7977204d54ed90b27589 | |
| parent | doc: Fix Dijkstra (diff) | |
| download | gnupg-ddd54d821020125f777c192e499d6967d02e3322.tar.gz gnupg-ddd54d821020125f777c192e499d6967d02e3322.zip | |
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 <[email protected]>
| -rw-r--r-- | common/logging.h | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/common/logging.h b/common/logging.h index c6a32b45a..e1bf56b17 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, |