xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 os/log.c |   30 ------------------------------
 1 file changed, 30 deletions(-)

New commits:
commit 79ad9400217d675d4b6d9d9ebde87030ff0df4d9
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Sep 9 16:38:12 2024 +0200

    os: log: drop unncessary HAVE_DIX_CONFIG
    
    It's always defined and dix-config.h is always present, so need for the
    extra check.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1680>

diff --git a/os/log.c b/os/log.c
index 2df75f491..a1e9cad55 100644
--- a/os/log.c
+++ b/os/log.c
@@ -75,9 +75,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
  * authorization from the copyright holder(s) and author(s).
  */
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include <errno.h>
 #include <stdio.h>
commit 2a959a27df48b3325c2927f78daf3c766c1cba0c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Sep 9 16:37:06 2024 +0200

    os: log: drop unnecessary ifdef's
    
    The #ifdef's for log prefix defines aren't needed, so drop them.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1680>

diff --git a/os/log.c b/os/log.c
index dfb226145..2df75f491 100644
--- a/os/log.c
+++ b/os/log.c
@@ -113,12 +113,8 @@ OR PERFORMANCE OF THIS SOFTWARE.
 void (*OsVendorVErrorFProc) (const char *, va_list args) = NULL;
 
 /* Default logging parameters. */
-#ifndef DEFAULT_LOG_VERBOSITY
 #define DEFAULT_LOG_VERBOSITY		0
-#endif
-#ifndef DEFAULT_LOG_FILE_VERBOSITY
 #define DEFAULT_LOG_FILE_VERBOSITY	3
-#endif
 
 static FILE *logFile = NULL;
 static int logFileFd = -1;
@@ -141,42 +137,18 @@ asm(".desc ___crashreporter_info__, 0x10");
 #endif
 
 /* Prefix strings for log messages. */
-#ifndef X_UNKNOWN_STRING
 #define X_UNKNOWN_STRING		"(\?\?)"
-#endif
-#ifndef X_PROBE_STRING
 #define X_PROBE_STRING			"(--)"
-#endif
-#ifndef X_CONFIG_STRING
 #define X_CONFIG_STRING			"(**)"
-#endif
-#ifndef X_DEFAULT_STRING
 #define X_DEFAULT_STRING		"(==)"
-#endif
-#ifndef X_CMDLINE_STRING
 #define X_CMDLINE_STRING		"(++)"
-#endif
-#ifndef X_NOTICE_STRING
 #define X_NOTICE_STRING			"(!!)"
-#endif
-#ifndef X_ERROR_STRING
 #define X_ERROR_STRING			"(EE)"
-#endif
-#ifndef X_WARNING_STRING
 #define X_WARNING_STRING		"(WW)"
-#endif
-#ifndef X_INFO_STRING
 #define X_INFO_STRING			"(II)"
-#endif
-#ifndef X_NOT_IMPLEMENTED_STRING
 #define X_NOT_IMPLEMENTED_STRING	"(NI)"
-#endif
-#ifndef X_DEBUG_STRING
 #define X_DEBUG_STRING			"(DB)"
-#endif
-#ifndef X_NONE_STRING
 #define X_NONE_STRING			""
-#endif
 
 static size_t
 strlen_sigsafe(const char *s)