From a07d1283b131d79c23e597bd488fcb54d23140bd Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 6 Nov 2025 14:41:39 +0100 Subject: [PATCH] dix: make BITMAP_SCANLINE_UNIT private Not used by any external drivers, so no need to keep it public. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dix_priv.h | 3 +++ hw/kdrive/src/kdrive.c | 1 + hw/xquartz/darwin.c | 1 + include/servermd.h | 7 ------- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dix/dix_priv.h b/dix/dix_priv.h index a1e1f37af3..44b584eb78 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -29,6 +29,9 @@ #include "include/resource.h" #include "include/window.h" +/* pad scanline to a longword */ +#define BITMAP_SCANLINE_UNIT 32 + #define LEGAL_NEW_RESOURCE(id,client) \ do { \ if (!LegalNewID((id), (client))) { \ diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 93b1a223d6..c93c7e2edd 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -23,6 +23,7 @@ #include #include "config/hotplug_priv.h" +#include "dix/dix_priv.h" #include "dix/screenint_priv.h" #include "os/cmdline.h" #include "os/ddx_priv.h" diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 58a0c13d61..28458041b5 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -34,6 +34,7 @@ #include #include +#include "dix/dix_priv.h" #include "dix/screenint_priv.h" #include "miext/extinit_priv.h" #include "os/ddx_priv.h" diff --git a/include/servermd.h b/include/servermd.h index 31f322cf4d..5802af58e7 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -68,16 +68,9 @@ SOFTWARE. #define GLYPHPADBYTES 4 #endif -/* pad scanline to a longword */ -#ifndef BITMAP_SCANLINE_UNIT -#define BITMAP_SCANLINE_UNIT 32 -#endif - -#ifndef BITMAP_SCANLINE_PAD #define BITMAP_SCANLINE_PAD 32 #define LOG2_BITMAP_PAD 5 #define LOG2_BYTES_PER_SCANLINE_PAD 2 -#endif #include /*