Merge topic branch t/realpath into pu

[dss.git] / log.h

diff --git a/log.h b/log.h
index 78ccc1b30b2a55114e55634ca32c09c486c8cbfe..47a3b7ac0e5786c7721d8d262252642da7f993bb 100644 (file)
--- a/log.h
+++ b/log.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /** debug loglevel, gets really noisy */
 #define DEBUG 1
@@ -19,9 +15,6 @@
 /** last message before exit */
 #define EMERG 7
 
-/** Log messages with lower priority than that will not be compiled in. */
-#define COMPILE_TIME_LOGLEVEL 0
-
 /** Not all compilers support __func__ or an equivalent. */
 #if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(__GNUC__)
 # if defined(_MSC_VER) && _MSC_VER >= 1300
@@ -32,73 +25,44 @@
 # endif
 #endif
 
-/** \cond */
-#if DEBUG > COMPILE_TIME_LOGLEVEL
 #define DSS_DEBUG_LOG(args) \
        do { \
                dss_log_set_params(DEBUG, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_DEBUG_LOG(args) do {;} while (0)
-#endif
 
-#if INFO > COMPILE_TIME_LOGLEVEL
 #define DSS_INFO_LOG(args) \
        do { \
                dss_log_set_params(INFO, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_INFO_LOG(args) do {;} while (0)
-#endif
 
-#if NOTICE > COMPILE_TIME_LOGLEVEL
 #define DSS_NOTICE_LOG(args) \
        do { \
                dss_log_set_params(NOTICE, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_NOTICE_LOG(args) do {;} while (0)
-#endif
 
-#if WARNING > COMPILE_TIME_LOGLEVEL
 #define DSS_WARNING_LOG(args) \
        do { \
                dss_log_set_params(WARNING, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_WARNING_LOG(args) do {;} while (0)
-#endif
 
-#if ERROR > COMPILE_TIME_LOGLEVEL
 #define DSS_ERROR_LOG(args) \
        do { \
                dss_log_set_params(ERROR, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_ERROR_LOG(args) do {;} while (0)
-#endif
 
-#if CRIT > COMPILE_TIME_LOGLEVEL
 #define DSS_CRIT_LOG(args) \
        do { \
                dss_log_set_params(CRIT, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_CRIT_LOG(args) do {;} while (0)
-#endif
 
-#if EMERG > COMPILE_TIME_LOGLEVEL
 #define DSS_EMERG_LOG(args) \
        do { \
                dss_log_set_params(EMERG, __FILE__, __LINE__, __func__); \
                dss_log args ; \
        } while (0)
-#else
-#define DSS_EMERG_LOG(args)
-#endif