From b1f60ad68c38007de1a5876351dbd48992af7581 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 May 2025 13:16:49 +0200
Subject: [PATCH] fb: unexport FbMaskBits() macro

No external users, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 fb/fb.h     | 15 ---------------
 fb/fbbits.h | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index 0eb50d158..82c19e017 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -128,21 +128,6 @@ typedef int FbStride;
 #define FbStipMask(x,w)	(FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \
 			 FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))
 
-#define FbMaskBits(x,w,l,n,r) { \
-    n = (w); \
-    r = FbRightMask((x)+n); \
-    l = FbLeftMask(x); \
-    if (l) { \
-	n -= FB_UNIT - ((x) & FB_MASK); \
-	if (n < 0) { \
-	    n = 0; \
-	    l &= r; \
-	    r = 0; \
-	} \
-    } \
-    n >>= FB_SHIFT; \
-}
-
 #define FbByteMaskInvalid   0x10
 
 #define FbPatternOffset(o,t)  ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1)))
diff --git a/fb/fbbits.h b/fb/fbbits.h
index d99ead8f8..1c38c43eb 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -31,6 +31,23 @@
 #include <dix-config.h>
 #endif
 
+#include "fb/fb.h"
+
+#define __FbMaskBits(x,w,l,n,r) { \
+    n = (w); \
+    r = FbRightMask((x)+n); \
+    l = FbLeftMask(x); \
+    if (l) { \
+        n -= FB_UNIT - ((x) & FB_MASK); \
+        if (n < 0) { \
+            n = 0; \
+            l &= r; \
+            r = 0; \
+        } \
+    } \
+    n >>= FB_SHIFT; \
+}
+
 #ifdef BITSSTORE
 #define STORE(b,x)  BITSSTORE(b,x)
 #else
@@ -785,7 +802,7 @@ POLYSEGMENT(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pseg)
                 dstLine = dst + (intToY(pt1) + yoff + dstYoff) * dstStride;
                 dstLine += dstX >> FB_SHIFT;
                 dstX &= FB_MASK;
-                FbMaskBits(dstX, width, startmask, nmiddle, endmask);
+                __FbMaskBits(dstX, width, startmask, nmiddle, endmask);
                 if (startmask) {
                     WRITE(dstLine,
                           FbDoMaskRRop(READ(dstLine), andBits, xorBits,